Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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