summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2017-03-13 15:53:17 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2017-03-13 15:53:17 +0100
commitc1aff8f82a196408b80898edd8518cd0ca4e83e9 (patch)
tree68524275f02eda78df052592d57f900389337cee
parentb8ca9bc43a9504dad94a66630170ab6311eb5c09 (diff)
downloadgitlab-ce-documentation/update-ci-docker-service-aliases-docs.tar.gz
Update description of how service alias hostnames are createddocumentation/update-ci-docker-service-aliases-docs
-rw-r--r--doc/ci/docker/using_docker_images.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 00787323b6b..41eca68f4d3 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -170,13 +170,16 @@ services:
```
When the job is run, `tutum/wordpress` will be started and you will have
-access to it from your build container under the hostname `tutum__wordpress`.
+access to it from your build container under the hostname `tutum-wordpress`
+(requires GitLab Runner v1.1.0 or newer) or `tutum__wordpress`.
-The alias hostname for the service is made from the image name following these
+The alias hostnames for the service are made from the image name following these
rules:
1. Everything after `:` is stripped
-2. Slash (`/`) is replaced with double underscores (`__`)
+2. Slash (`/`) is replaced with double underscores (`__`) - _primary alias_
+3. Slash (`/`) is replaced with dash (`-`) - _secondary alias, requires
+ GitLab Runner v1.1.0 or newer_
## Configuring services