summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pundsack <markpundsack@users.noreply.github.com>2016-06-13 22:45:43 -0700
committerMark Pundsack <markpundsack@users.noreply.github.com>2016-06-13 22:45:43 -0700
commit8df7d90d5a92b7d8aa26ac07b7391b4e86d63499 (patch)
treeb29b386e05f523de56013b832b924b2f17221f78
parentaefb08cb6a8bd15415b641c385e790f941b72ced (diff)
downloadgitlab-ce-8df7d90d5a92b7d8aa26ac07b7391b4e86d63499.tar.gz
De-note-ify
-rw-r--r--doc/ci/docker/using_docker_build.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 36ff4dcf05a..39eea740d18 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -140,14 +140,14 @@ In order to do that, follow the steps:
- docker run my-docker-image /script/to/run/tests
```
-> **Notes:**
-> * By enabling `--docker-privileged`, you are effectively disabling all of
+Docker-in-Docker works well, and is our recommended configuration, but it is not without its own challenges:
+* 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].
-> * Using docker-in-docker, each build is in a clean environment without the past
+* Using docker-in-docker, each build is in a clean environment without the past
history. Concurrent builds work fine because every build gets it's own instance of docker engine so they won't conflict with each other. But this also means builds can be slower because there's no caching of layers.
-> * By default, `docker:dind` uses `--storage-driver vfs` which is the slowest form
+* By default, `docker:dind` uses `--storage-driver vfs` which is the slowest form
offered.
An example project using this approach can be found here: https://gitlab.com/gitlab-examples/docker.