summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-05-09 09:22:57 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-05-09 11:21:53 +0100
commit63001125330ee990f9503d7ad14470bf03ad01af (patch)
tree5679ecb811287a4299a5ac09fac0dd497569d530
parentae992c6a85018462c775457c3d8af15022a2e17f (diff)
downloadgitlab-ce-63001125330ee990f9503d7ad14470bf03ad01af.tar.gz
Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into 'master'
Updates Clair container scanning GitLab CI configuration Closes #45819 See merge request gitlab-org/gitlab-ce!18614
-rw-r--r--doc/ci/examples/container_scanning.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/examples/container_scanning.md b/doc/ci/examples/container_scanning.md
index eb76521cc02..a9501f6c577 100644
--- a/doc/ci/examples/container_scanning.md
+++ b/doc/ci/examples/container_scanning.md
@@ -23,7 +23,7 @@ sast:container:
- docker:stable-dind
script:
- docker run -d --name db arminc/clair-db:latest
- - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
+ - docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:v2.0.1
- apk add -U wget ca-certificates
- docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
- wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64