Commit 8768e295 authored by Thong Kuah's avatar Thong Kuah

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
parents a842c388 c472bec5
---
title: Set DOCKER_TLS_CERTDIR in CI job templates to fix Docker-in-Docker service
merge_request: 31080
author:
type: fixed
...@@ -2,6 +2,8 @@ performance: ...@@ -2,6 +2,8 @@ performance:
stage: performance stage: performance
image: docker:stable image: docker:stable
allow_failure: true allow_failure: true
variables:
DOCKER_TLS_CERTDIR: ""
services: services:
- docker:stable-dind - docker:stable-dind
script: script:
......
build: build:
stage: build stage: build
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable" image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable"
variables:
DOCKER_TLS_CERTDIR: ""
services: services:
- docker:stable-dind - docker:stable-dind
script: script:
......
...@@ -6,6 +6,7 @@ code_quality: ...@@ -6,6 +6,7 @@ code_quality:
- docker:stable-dind - docker:stable-dind
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
...@@ -9,6 +9,7 @@ dependency_scanning: ...@@ -9,6 +9,7 @@ dependency_scanning:
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
......
...@@ -9,6 +9,7 @@ sast: ...@@ -9,6 +9,7 @@ sast:
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment