Commit 7df008a5 authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'remove-dind-from-cs-docs' into 'master'

Move DinD to job level in CS docs

See merge request gitlab-org/gitlab!32815
parents cb8d351f 908fcaa9
...@@ -103,9 +103,6 @@ Registry, and scans the containers: ...@@ -103,9 +103,6 @@ Registry, and scans the containers:
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services:
- docker:19.03.8-dind
stages: stages:
- build - build
- test - test
...@@ -113,6 +110,8 @@ stages: ...@@ -113,6 +110,8 @@ stages:
build: build:
image: docker:stable image: docker:stable
stage: build stage: build
services:
- docker:19.03.8-dind
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
script: script:
...@@ -274,14 +273,13 @@ this with a pipeline means you won't have to do it manually each time. You can u ...@@ -274,14 +273,13 @@ this with a pipeline means you won't have to do it manually each time. You can u
```yaml ```yaml
image: docker:stable image: docker:stable
services:
- docker:19.03.8-dind
stages: stages:
- build - build
build_latest_vulnerabilities: build_latest_vulnerabilities:
stage: build stage: build
services:
- docker:19.03.8-dind
script: script:
- docker pull arminc/clair-db:latest - docker pull arminc/clair-db:latest
- docker tag arminc/clair-db:latest $CI_REGISTRY/namespace/clair-vulnerabilities-db - docker tag arminc/clair-db:latest $CI_REGISTRY/namespace/clair-vulnerabilities-db
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment