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:
commit
8768e295c3
|
@ -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
|
|
@ -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:
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
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:
|
||||||
- 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:
|
||||||
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:
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue