summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorMark Pundsack <markpundsack@users.noreply.github.com>2016-06-13 22:47:54 -0700
committerMark Pundsack <markpundsack@users.noreply.github.com>2016-06-13 22:47:54 -0700
commit6ed7fcad29d0b96b4513c2961c342d0309eda07e (patch)
treeb160f8b4e25c3039d205a430a41431576fd5346e /doc/ci
parent8df7d90d5a92b7d8aa26ac07b7391b4e86d63499 (diff)
downloadgitlab-ce-6ed7fcad29d0b96b4513c2961c342d0309eda07e.tar.gz
Remove our
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/docker/using_docker_build.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 39eea740d18..7f83f846454 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -140,7 +140,7 @@ In order to do that, follow the steps:
- docker run my-docker-image /script/to/run/tests
```
-Docker-in-Docker works well, and is our recommended configuration, but it is not without its own challenges:
+Docker-in-Docker works well, and is the 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