Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorMark Pundsack <markpundsack@users.noreply.github.com>2016-06-14 08:42:46 +0300
committerMark Pundsack <markpundsack@users.noreply.github.com>2016-06-14 08:42:46 +0300
commitaefb08cb6a8bd15415b641c385e790f941b72ced (patch)
tree71951bb43db90e336f937520d69046aa0aeaf28b /doc/ci
parent4c571041de6989d71f09fc326f8d6bee731f0b19 (diff)
Clarify dind example
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/docker/using_docker_build.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 09a2d8b5966..36ff4dcf05a 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -122,7 +122,7 @@ In order to do that, follow the steps:
Insecure = false
```
-1. You can now use `docker` in the build script:
+1. You can now use `docker` in the build script (note the inclusion of the `docker:dind` service):
```yaml
image: docker:latest
@@ -141,7 +141,7 @@ In order to do that, follow the steps:
```
> **Notes:**
-> * By enabling `--docker-privileged`, you are effectively disabling all
+> * By enabling `--docker-privileged`, you are effectively disabling all of
the security mechanisms of containers and exposing your host to privilege
escalation which can lead to container breakout. For more information, check out the official Docker documentation on
[Runtime privilege and Linux capabilities][docker-cap].