diff options
| author | Evan Read <eread@gitlab.com> | 2019-05-28 01:09:25 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-05-28 01:09:25 +0000 |
| commit | 96badd39d47d4bb8f7b2433be153b7df4ddd209f (patch) | |
| tree | dd0709005d14e657766b612d90a6c538c5b8463e | |
| parent | 3b4d7b4268c933ef9c628d81ac4fc2161e927530 (diff) | |
| parent | 0831efaeeda55c4dd7a270581d439aa1c811d72c (diff) | |
| download | gitlab-ce-96badd39d47d4bb8f7b2433be153b7df4ddd209f.tar.gz | |
Merge branch 'docs-update-docker-executor' into 'master'
Docs: add tip for Kubernetes executor using dind
Closes #61881
See merge request gitlab-org/gitlab-ce!28457
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 5222cc45bc4..dd112dadc40 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -142,9 +142,12 @@ In order to do that, follow the steps: # The 'docker' hostname is the alias of the service container as described at # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services # - # Note that if you're using Kubernetes executor, the variable should be set to - # tcp://localhost:2375 because of how Kubernetes executor connects services + # Note that if you're using the Kubernetes executor, the variable should be set to + # tcp://localhost:2375/ because of how the Kubernetes executor connects services # to the job container + # DOCKER_HOST: tcp://localhost:2375/ + # + # For non-Kubernetes executors, we use tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/ # When using dind, it's wise to use the overlayfs driver for # improved performance. |