summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-15 16:37:51 +0000
committerRémy Coutable <remy@rymai.me>2017-06-15 16:37:51 +0000
commit75d425e4fcfb884960e179d5268a14829e183a70 (patch)
treeb71df7bfba86d1bb08772649083c2a5d9fdc6f1a /doc
parent8f9bb2127707b62457bc35c4051d92d93dea8c3f (diff)
parentaf156c6081025f94b638b207af63be4008da3769 (diff)
downloadgitlab-ce-75d425e4fcfb884960e179d5268a14829e183a70.tar.gz
Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urls
Service hostname also include registry name, when using non Docker Hub registry. See merge request !11729
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/docker/using_docker_images.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 7709541ba9d..be4dea55c20 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -210,6 +210,18 @@ When the job is run, `tutum/wordpress` will be started and you will have
access to it from your build container under the hostnames `tutum-wordpress`
(requires GitLab Runner v1.1.0 or newer) and `tutum__wordpress`.
+When using a private registry, the image name also includes a hostname and port
+of the registry.
+
+```yaml
+services:
+- docker.example.com:5000/wordpress:latest
+```
+
+The service hostname will also include the registry hostname. Service will be
+available under hostnames `docker.example.com-wordpress` (requires GitLab Runner v1.1.0 or newer)
+and `docker.example.com__wordpress`.
+
*Note: hostname with underscores is not RFC valid and may cause problems in 3rd party applications.*
The alias hostnames for the service are made from the image name following these