From b1221669168e781c534f6aa7a31bdd087dcc97a7 Mon Sep 17 00:00:00 2001 From: Matej Date: Fri, 26 May 2017 09:30:51 +0000 Subject: Service hostname also include registry name, when using non Docker Hub registry. --- doc/ci/docker/using_docker_images.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc') diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 96834e15bb9..43a37e3ba1a 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -173,6 +173,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 private registry, image name usually also include hostname and port +of the registry. + +```yaml +services: +- docker.example.com:5000/wordpress:latest +``` + +In this case, hostname will also include registry's 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 -- cgit v1.2.3 From af156c6081025f94b638b207af63be4008da3769 Mon Sep 17 00:00:00 2001 From: Matej Zerovnik Date: Mon, 12 Jun 2017 21:36:08 +0200 Subject: Language typos fixed --- doc/ci/docker/using_docker_images.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 43a37e3ba1a..61ba45cf2d3 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -173,7 +173,7 @@ 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 private registry, image name usually also include hostname and port +When using a private registry, the image name also includes a hostname and port of the registry. ```yaml @@ -181,7 +181,7 @@ services: - docker.example.com:5000/wordpress:latest ``` -In this case, hostname will also include registry's hostname. Service will be +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`. -- cgit v1.2.3