summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiger <twatson@gitlab.com>2019-07-24 09:52:39 +1000
committerTiger <twatson@gitlab.com>2019-07-24 09:57:49 +1000
commitaf88ccfae8d972cd4f74ac5742ab58cd036b6582 (patch)
tree75f50471645635f7be8976c9d979e590c8747e35
parenta1d1b3aa89850844f824205eb75c56af3b5228f3 (diff)
downloadgitlab-ce-af88ccfae8d972cd4f74ac5742ab58cd036b6582.tar.gz
Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template65019-auto-devops-dind-tls-fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
-rw-r--r--changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml5
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
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