diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-17 11:25:41 -0700 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-17 11:35:27 -0700 |
| commit | c017ab0447ea95902d1b7458cad223a9bcb21169 (patch) | |
| tree | 22a56524601584e82aada3080ef0b7076be9c75a | |
| parent | bbbf04b1ba3069b607dff265fd2bbad9e27d5b82 (diff) | |
| download | gitlab-ce-11105-fix-cs-with-proxy.tar.gz | |
Add comment on why we define NO_PROXY11105-fix-cs-with-proxy
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
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 40833a18933..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,7 +23,8 @@ 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 - CLAIR_LOCAL_SCAN_VERSION: v2.0.6 + ## 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: |