diff options
| author | Gilbert Roulot <groulot@gitlab.com> | 2018-04-16 16:34:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-16 16:34:43 +0000 |
| commit | 07905c6916fcd08eb685ffa9b1d85d7884fe0a81 (patch) | |
| tree | 678a399437378bc5a25a6cd35037bf1231d4e0f5 | |
| parent | 671a204ccce6990ed1ad1d014482af6f7df0c52c (diff) | |
| download | gitlab-ce-07905c6916fcd08eb685ffa9b1d85d7884fe0a81.tar.gz | |
Fix container scanning in vendored GitLab CI configuration for Auto Devops
| -rw-r--r-- | doc/ci/examples/container_scanning.md | 1 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/ci/examples/container_scanning.md b/doc/ci/examples/container_scanning.md index c58efc7392a..dc34f4acd75 100644 --- a/doc/ci/examples/container_scanning.md +++ b/doc/ci/examples/container_scanning.md @@ -30,6 +30,7 @@ sast:container: - mv clair-scanner_linux_amd64 clair-scanner - chmod +x clair-scanner - touch clair-whitelist.yml + - while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true artifacts: paths: [gl-sast-container-report.json] diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 4810035a9e3..4f4ed80d101 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -315,6 +315,7 @@ production: mv clair-scanner_linux_amd64 clair-scanner chmod +x clair-scanner touch clair-whitelist.yml + while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true } |