summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-06-26 00:21:18 +0000
committerEvan Read <eread@gitlab.com>2019-06-26 00:21:18 +0000
commit39b9cfa0bfa889368013f89ed338f856873d1819 (patch)
tree361d757605d335c8afc01d3049b578db46b85575
parent3221f1a758b661133a546967167ec81b6917abfb (diff)
parent137e37d3e9c5369230d609a2f1553d2c65b2a747 (diff)
downloadgitlab-ce-39b9cfa0bfa889368013f89ed338f856873d1819.tar.gz
Merge branch 'docs/63418-docs-feedback-update-for-11-11-1-feature-flag' into 'master'
Add note about Docker socket mounting See merge request gitlab-org/gitlab-ce!29924
-rw-r--r--doc/ci/docker/using_docker_build.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index b4c4bea6447..efdcaf5a6f5 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -205,7 +205,14 @@ An example project using this approach can be found here: <https://gitlab.com/gi
### Use Docker socket binding
-The third approach is to bind-mount `/var/run/docker.sock` into the container so that docker is available in the context of that image.
+The third approach is to bind-mount `/var/run/docker.sock` into the
+container so that Docker is available in the context of that image.
+
+NOTE: **Note:**
+If you bind the Docker socket [when using GitLab Runner 11.11 or
+newer](https://gitlab.com/gitlab-org/gitlab-runner/merge_requests/1261),
+you can no longer use `docker:dind` as a service because volume bindings
+are done to the services as well, making these incompatible.
In order to do that, follow the steps: