diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-16 16:34:43 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-17 13:30:02 +0100 |
| commit | 8da7858abf6a4810909b5c95a73544e2dd2a9779 (patch) | |
| tree | ab463e3c8c3540743c37eb87b93fcae65b7aac58 /doc | |
| parent | 0fabf59c0a6e1d3748438d5451926c519eea638c (diff) | |
| download | gitlab-ce-8da7858abf6a4810909b5c95a73544e2dd2a9779.tar.gz | |
Merge branch 'fix_container_scanning_in_vendored_gitlab_ci_yml_for_auto_devops' into 'master'
Fix container scanning in vendored GitLab CI configuration for Auto Devops
See merge request gitlab-org/gitlab-ce!18374
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/examples/container_scanning.md | 1 |
1 files changed, 1 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] |