diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-29 01:11:45 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-29 01:11:45 +0000 |
| commit | 54dbaba577ad28645e71080698abee55fd2797ab (patch) | |
| tree | a4eec25bbcb40aeac81e2412495c41fe1c1d6861 | |
| parent | 9daae83fdd14d2cfb5b4b9651cae178884892ac7 (diff) | |
| parent | b41b9e6005df7d32a586bf92d858291480beb83a (diff) | |
| download | gitlab-ce-54dbaba577ad28645e71080698abee55fd2797ab.tar.gz | |
Merge branch '11105-fix-cs-with-proxy' into 'master'
Disable proxy in container scanning template
Closes gitlab-ee#11105
See merge request gitlab-org/gitlab-ce!27246
| -rw-r--r-- | changelogs/unreleased/11105-fix-cs-with-proxy.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/11105-fix-cs-with-proxy.yml b/changelogs/unreleased/11105-fix-cs-with-proxy.yml new file mode 100644 index 00000000000..ee32427d20e --- /dev/null +++ b/changelogs/unreleased/11105-fix-cs-with-proxy.yml @@ -0,0 +1,5 @@ +--- +title: Fix proxy support in Container Scanning +merge_request: 27246 +author: +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 324e39c7747..5372ec6cceb 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -23,6 +23,9 @@ container_scanning: DOCKER_HOST: tcp://${DOCKER_SERVICE}:2375/ # https://hub.docker.com/r/arminc/clair-local-scan/tags CLAIR_LOCAL_SCAN_VERSION: v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1 + ## Disable the proxy for clair-local-scan, otherwise Container Scanning will + ## fail when a proxy is used. + NO_PROXY: ${DOCKER_SERVICE},localhost allow_failure: true services: - docker:stable-dind |