diff options
| author | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-30 11:31:58 +0300 |
|---|---|---|
| committer | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-30 11:31:58 +0300 |
| commit | a98f3de66eafd78f2769a848aa565612a5bbc337 (patch) | |
| tree | cfc358b93adeb44fdb6281df12285df6ea7bbb4c /doc/ci/docker | |
| parent | 14e7cbe5813db792a4591565ea872745937e8406 (diff) | |
Update docker title for docker-in-docker workflow
`docker-in-docker` is a workflow not an specific executor. It uses the
[Docker executor](https://docs.gitlab.com/runner/executors/docker.html).
Diffstat (limited to 'doc/ci/docker')
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 2 | ||||
| -rw-r--r-- | doc/ci/docker/using_kaniko.md | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 9f1ce1fc230..10a21edbd34 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -91,7 +91,7 @@ NOTE: **Note:** By adding `gitlab-runner` to the `docker` group you are effectively granting `gitlab-runner` full root permissions. For more information please read [On Docker security: `docker` group considered harmful](https://www.andreas-jung.com/contents/on-docker-security-docker-group-considered-harmful). -### Use docker-in-docker executor +### Use docker-in-docker workflow with Docker executor The second approach is to use the special docker-in-docker (dind) [Docker image](https://hub.docker.com/_/docker/) with all tools installed diff --git a/doc/ci/docker/using_kaniko.md b/doc/ci/docker/using_kaniko.md index 50f1ac3d54a..925653f9fdf 100644 --- a/doc/ci/docker/using_kaniko.md +++ b/doc/ci/docker/using_kaniko.md @@ -11,7 +11,8 @@ Requires GitLab Runner 11.2 and above. container images from a Dockerfile, inside a container or Kubernetes cluster. kaniko solves two problems with using the -[docker-in-docker build](using_docker_build.md#use-docker-in-docker-executor) method: +[docker-in-docker +build](using_docker_build.md#use-docker-in-docker-workflow-with-docker-executor) method: - Docker-in-docker requires [privileged mode](https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities) in order to function, which is a significant security concern. |