diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-14 14:03:29 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-16 17:15:02 +0800 |
| commit | 0390734b71f0cc381d3cc6d5ec88cfcfa54d3b3e (patch) | |
| tree | 5c1b445cb44d2763e5fe541e518f64073ce7425f | |
| parent | e7f29e78502dcbedee51bb7577b05b29d9729ac4 (diff) | |
| download | gitlab-ce-0390734b71f0cc381d3cc6d5ec88cfcfa54d3b3e.tar.gz | |
Merge branch 'patch-15' into 'master'
Update using_docker_images.md
See merge request !9894
| -rw-r--r-- | doc/ci/docker/using_docker_images.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 00787323b6b..f025a7e3496 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -170,13 +170,17 @@ 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 hostnames `tutum-wordpress` +(requires GitLab Runner v1.1.0 or newer) and `tutum__wordpress`. -The alias hostname for the service is made from the image name following these +*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 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 |