diff options
| author | James Lopez <james@gitlab.com> | 2019-05-07 13:41:15 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-05-07 13:41:15 +0000 |
| commit | 5290c5c32b39914888665b7e792a2a2a61492e06 (patch) | |
| tree | 6c558952a1032349d215e74afe47cedfede97250 | |
| parent | fb688545e51d87d3b145b0c7fa9adc8c6b2139b2 (diff) | |
| parent | ff83da7150cf23847998dbeb02569a7981545baf (diff) | |
| download | gitlab-ce-5290c5c32b39914888665b7e792a2a2a61492e06.tar.gz | |
Merge branch 'ce-11430-update_clair_local_scan' into 'master'
Bump clair-local-scan to v2.0.8
See merge request gitlab-org/gitlab-ce!27977
| -rw-r--r-- | changelogs/unreleased/ce-11430-update_clair_local_scan.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/ce-11430-update_clair_local_scan.yml b/changelogs/unreleased/ce-11430-update_clair_local_scan.yml new file mode 100644 index 00000000000..04bb04c3919 --- /dev/null +++ b/changelogs/unreleased/ce-11430-update_clair_local_scan.yml @@ -0,0 +1,5 @@ +--- +title: Update clair-local-scan to v2.0.8 for container scanning +merge_request: 27977 +author: +type: other 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 eef361c19e9..324e39c7747 100644 --- a/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml @@ -22,7 +22,7 @@ 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.6 + CLAIR_LOCAL_SCAN_VERSION: v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1 allow_failure: true services: - docker:stable-dind |