diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-18 21:25:44 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-18 21:25:44 +0300 |
| commit | 371a9edc96810385189bb779ab2b43c19991d7dd (patch) | |
| tree | b61ea9a40b3aa47e86d4f809de31bfc815c97197 | |
| parent | 05aa49765f6886e7530fcd30b4925f80013cef41 (diff) | |
| parent | 30aaf6c6abc61f05a8b9646549f75fee267cef3e (diff) | |
Merge branch '5706-fix_container_scanning_in_vendored_gitlab_ci_yml' into 'master'
Resolve "Avoid possible infinite loops in Container Scanning"
See merge request gitlab-org/gitlab-ce!18467
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 4f4ed80d101..3b77055b644 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -315,7 +315,9 @@ 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 + 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 } |