From 7a8ce8e36e3e9d32ec0fc8d9dbe05bf52b16651e Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 19 Apr 2018 14:14:23 +0000 Subject: Merge branch '45543_update_container_scanning_documentation' into 'master' Update Container Scanning documentation Closes #45543 See merge request gitlab-org/gitlab-ce!18479 --- doc/ci/examples/container_scanning.md | 3 +++ 1 file changed, 3 insertions(+) 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] -- cgit v1.2.1