diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-09 09:22:57 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-09 09:22:57 +0000 |
| commit | 21eccf428e67efe672227be443bed4305c2d2693 (patch) | |
| tree | 7cc582054f9dd9e8bf17d7a70d2d7466ddf2fb04 | |
| parent | 9a54cb3601d5f581c92a46c2e9a0c0583a3475e0 (diff) | |
| parent | 689a02e54c03c157ee1bf87f3975616e2165af56 (diff) | |
| download | gitlab-ce-21eccf428e67efe672227be443bed4305c2d2693.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.md | 2 |
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 |