Merge branch '65019-job-templates-dind-tls-fix' into 'master'

Set DOCKER_TLS_CERTDIR in CI job templates

See merge request gitlab-org/gitlab-ce!31080
This commit is contained in:
Thong Kuah 2019-07-24 02:29:06 +00:00
commit 8768e295c3
6 changed files with 12 additions and 0 deletions

View File

@ -0,0 +1,5 @@
---
title: Set DOCKER_TLS_CERTDIR in CI job templates to fix Docker-in-Docker service
merge_request: 31080
author:
type: fixed

View File

@ -2,6 +2,8 @@ performance:
stage: performance
image: docker:stable
allow_failure: true
variables:
DOCKER_TLS_CERTDIR: ""
services:
- docker:stable-dind
script:

View File

@ -1,6 +1,8 @@
build:
stage: build
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable"
variables:
DOCKER_TLS_CERTDIR: ""
services:
- docker:stable-dind
script:

View File

@ -6,6 +6,7 @@ code_quality:
- docker:stable-dind
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
script:
- |
if ! docker info &>/dev/null; then

View File

@ -9,6 +9,7 @@ dependency_scanning:
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
allow_failure: true
services:
- docker:stable-dind

View File

@ -9,6 +9,7 @@ sast:
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
allow_failure: true
services:
- docker:stable-dind