diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-08-05 10:56:09 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-08-05 10:56:09 +0300 |
| commit | 5e20689d890598a6f1539a43365659cade13cdae (patch) | |
| tree | 074491f49b91c1d5001ce920507e59c064d6fb1d | |
| parent | c1ad664588bf185265c75ff437484a758cee72d1 (diff) | |
| parent | b7733d5f21be8cea680f9b16722e96f9c54383f9 (diff) | |
Merge branch 'GL-12757' into 'master'
Increase clair scanner from v11 to v12
See merge request gitlab-org/gitlab-ce!30809
| -rw-r--r-- | changelogs/unreleased/GL-12757.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/GL-12757.yml b/changelogs/unreleased/GL-12757.yml new file mode 100644 index 00000000000..e58ecf9259f --- /dev/null +++ b/changelogs/unreleased/GL-12757.yml @@ -0,0 +1,5 @@ +--- +title: Update the container scanning CI template to use v12 of the clair scanner. +merge_request: 30809 +author: +type: changed 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 3e006194236..c963d6ed1c4 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -23,8 +23,8 @@ container_scanning: DOCKER_SERVICE: docker 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_EXECUTABLE_VERSION: v11 + CLAIR_LOCAL_SCAN_VERSION: v2.0.8_0ed98e9ead65a51ba53f7cc53fa5e80c92169207 + CLAIR_EXECUTABLE_VERSION: v12 ## Disable the proxy for clair-local-scan, otherwise Container Scanning will ## fail when a proxy is used. NO_PROXY: ${DOCKER_SERVICE},localhost |