diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-05 03:47:25 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-05 15:38:21 +0000 |
| commit | f531a3f1574e001d3c83f5df1d0186cec02e8960 (patch) | |
| tree | 00c5f8e13f1f9835268cb64703f4a40e7e524054 | |
| parent | 8e2389542866a44fe87f0955b047882077ab9b2f (diff) | |
| download | gitlab-ce-f531a3f1574e001d3c83f5df1d0186cec02e8960.tar.gz | |
Merge branch 'patch-72' into 'master'
Set DOCKER_TLS_CERTDIR in CI job templates
See merge request gitlab-org/gitlab-ce!31201
(cherry picked from commit 82ce29d32fc8d98571ee43a6d348f89bdecfa9c0)
8d4f53a0 Set DOCKER_TLS_CERTDIR in CI job templates
25486f40 Merge remote-tracking branch 'upstream/master' into patch-72
2535575c Add changelog.
| -rw-r--r-- | changelogs/unreleased/patch-72.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 1 |
2 files changed, 6 insertions, 0 deletions
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 |