diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-24 02:27:16 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-24 02:27:16 +0000 |
| commit | a842c3882c4b47cc8b384fbd84be5643dacc7269 (patch) | |
| tree | 75f50471645635f7be8976c9d979e590c8747e35 | |
| parent | a1d1b3aa89850844f824205eb75c56af3b5228f3 (diff) | |
| parent | af88ccfae8d972cd4f74ac5742ab58cd036b6582 (diff) | |
| download | gitlab-ce-a842c3882c4b47cc8b384fbd84be5643dacc7269.tar.gz | |
Merge branch '65019-auto-devops-dind-tls-fix' into 'master'
Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template
See merge request gitlab-org/gitlab-ce!31078
| -rw-r--r-- | changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml b/changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml new file mode 100644 index 00000000000..3eea3e551ce --- /dev/null +++ b/changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml @@ -0,0 +1,5 @@ +--- +title: Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template to fix jobs using Docker-in-Docker +merge_request: 31078 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index cf3d261c1cb..7b9a169a91f 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -57,6 +57,8 @@ variables: ROLLOUT_RESOURCE_TYPE: deployment + DOCKER_TLS_CERTDIR: "" # https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 + stages: - build - test |