From 4b76d631e44a339f5301ed151fd8ce6af1443aa8 Mon Sep 17 00:00:00 2001 From: Cameron Boulton Date: Mon, 5 Aug 2019 03:47:24 +0000 Subject: [PATCH] Set DOCKER_TLS_CERTDIR in CI job templates --- changelogs/unreleased/patch-72.yml | 5 +++++ .../ci/templates/Security/Container-Scanning.gitlab-ci.yml | 1 + 2 files changed, 6 insertions(+) create mode 100644 changelogs/unreleased/patch-72.yml diff --git a/changelogs/unreleased/patch-72.yml b/changelogs/unreleased/patch-72.yml new file mode 100644 index 00000000000..ff2bac2fc29 --- /dev/null +++ b/changelogs/unreleased/patch-72.yml @@ -0,0 +1,5 @@ +--- +title: Fix Docker in Docker (DIND) listen port behavior change by adding DOCKER_TLS_CERTDIR in CI job templates. +merge_request: 31201 +author: Cameron Boulton +type: fixed diff --git a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml index 5ad624bb15f..3e006194236 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -5,6 +5,7 @@ container_scanning: image: docker:stable variables: DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: "" # Defining two new variables based on GitLab's CI/CD predefined variables # https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG