diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-19 14:14:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-19 14:14:23 +0000 |
| commit | 6b62d0c3456e52ed8cac2246d50089a73392c54e (patch) | |
| tree | f66d1ec7b00234cd91ad541693c0064d53ad2d21 | |
| parent | ddbc6d85e471188bc52965358f390615a508f2f9 (diff) | |
| parent | 9c5664e699213209bfbc0ef4d4a7efa6ebc75907 (diff) | |
| download | gitlab-ce-6b62d0c3456e52ed8cac2246d50089a73392c54e.tar.gz | |
Merge branch '45543_update_container_scanning_documentation' into 'master'
Update Container Scanning documentation
Closes #45543
See merge request gitlab-org/gitlab-ce!18479
| -rw-r--r-- | doc/ci/examples/container_scanning.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ci/examples/container_scanning.md b/doc/ci/examples/container_scanning.md index dc34f4acd75..eb76521cc02 100644 --- a/doc/ci/examples/container_scanning.md +++ b/doc/ci/examples/container_scanning.md @@ -31,6 +31,9 @@ sast:container: - chmod +x clair-scanner - touch clair-whitelist.yml - while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done + - retries=0 + - echo "Waiting for clair daemon to start" + - while( ! wget -T 10 -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; echo -n "." ; if [ $retries -eq 10 ] ; then echo " Timeout, aborting." ; exit 1 ; fi ; retries=$(($retries+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] |