diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-18 18:25:44 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-04-18 14:19:22 -0500 |
| commit | 11e88f2ba5fc414c29b821ffd71f6a913ea1b609 (patch) | |
| tree | 505bda3d168b6ff37133689f9b988d92fd9f848a | |
| parent | cd47325959b00a0f6cf38ad1fcfcf1a4400c16b8 (diff) | |
| download | gitlab-ce-11e88f2ba5fc414c29b821ffd71f6a913ea1b609.tar.gz | |
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
(cherry picked from commit 371a9edc96810385189bb779ab2b43c19991d7dd)
| -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 } |