summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-11-28 02:50:59 +0000
committerEvan Read <eread@gitlab.com>2018-11-28 02:50:59 +0000
commit979bd9161fe0508f77e9e04973fcb94687f8cd27 (patch)
tree54e870842cd22683064ab8f4bbdf6849145ff75b
parent591b703470eb4fca8640c74b351e28fb91e31c25 (diff)
parent33a9c5017a1a355024ce04938be1452b4b76f952 (diff)
downloadgitlab-ce-979bd9161fe0508f77e9e04973fcb94687f8cd27.tar.gz
Merge branch 'gitlab-runner-services-dns-hosts' into 'master'
using_docker_images.md: document services inheriting dns and addn hosts settings See merge request gitlab-org/gitlab-ce!23333
-rw-r--r--doc/ci/docker/using_docker_images.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 31649ee2792..959271d8abc 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -67,6 +67,9 @@ services you need to `.gitlab-ci.yml` or manually modify `config.toml`.
Any image found at [Docker Hub][hub] or your private Container Registry can be
used as a service.
+Services inherit the same DNS servers, search domains, and additional hosts as
+the CI container itself.
+
You can see some widely used services examples in the relevant documentation of
[CI services examples](../services/README.md).