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
This commit is contained in:
commit
371a9edc96
|
@ -315,7 +315,9 @@ production:
|
||||||
mv clair-scanner_linux_amd64 clair-scanner
|
mv clair-scanner_linux_amd64 clair-scanner
|
||||||
chmod +x clair-scanner
|
chmod +x clair-scanner
|
||||||
touch clair-whitelist.yml
|
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
|
./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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue