diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-10 10:46:48 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-10 10:46:48 +0000 |
| commit | e8e83ec4f0e5b433e09d30183d93fb649f0ecd6e (patch) | |
| tree | 96b82fe541ff53a12998bc6e2ca4389f7fb05061 | |
| parent | 1ed911ada040d7ca4dfe801f1d4ef2c1743e7ddd (diff) | |
| parent | f0212cd32b95f74dd64dbcd6fdbea3bb09d44eca (diff) | |
| download | gitlab-ce-e8e83ec4f0e5b433e09d30183d93fb649f0ecd6e.tar.gz | |
Merge branch 'update-clair-version' into 'master'
Update Clair Version V8 to V11
See merge request gitlab-org/gitlab-ce!30396
| -rw-r--r-- | changelogs/unreleased/update-clair-version.yml | 6 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/update-clair-version.yml b/changelogs/unreleased/update-clair-version.yml new file mode 100644 index 00000000000..59b6e113fd5 --- /dev/null +++ b/changelogs/unreleased/update-clair-version.yml @@ -0,0 +1,6 @@ +--- +title: Extract clair version as CLAIR_EXECUTABLE_VERSION variable and update clair + executable from v8 to v11 +merge_request: 30396 +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 d1a34c515fa..5ad624bb15f 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,7 @@ 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_EXECUTABLE_VERSION: v11 ## Disable the proxy for clair-local-scan, otherwise Container Scanning will ## fail when a proxy is used. NO_PROXY: ${DOCKER_SERVICE},localhost @@ -41,7 +42,7 @@ container_scanning: - docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:${CLAIR_LOCAL_SCAN_VERSION} - apk add -U wget ca-certificates - docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} - - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64 + - wget https://github.com/arminc/clair-scanner/releases/download/${CLAIR_EXECUTABLE_VERSION}/clair-scanner_linux_amd64 - mv clair-scanner_linux_amd64 clair-scanner - chmod +x clair-scanner - touch clair-whitelist.yml |