From 64df65d0bed0f863632f53a1f0132040a5796de5 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 24 Jul 2019 02:27:16 +0000 Subject: [PATCH] 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 (cherry picked from commit a842c3882c4b47cc8b384fbd84be5643dacc7269) af88ccfa Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template --- changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml | 5 +++++ lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 changelogs/unreleased/65019-auto-devops-dind-tls-fix.yml 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 -- GitLab