diff options
author | Marcel Amirault <mamirault@gitlab.com> | 2019-09-03 00:43:28 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-09-03 00:43:28 +0000 |
commit | 42805130aede7d2233888fae164fae74676832cf (patch) | |
tree | 7ade4752400e2d45be0ff678e580513a2b04f389 | |
parent | 2fe3f219084a2d0dd0e676612a1bd332177fcb04 (diff) | |
download | gitlab-ce-42805130aede7d2233888fae164fae74676832cf.tar.gz |
Add suggested changes to docker build doc
-rw-r--r-- | doc/ci/docker/using_docker_build.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 730e46f994e..a48da557e09 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -580,9 +580,10 @@ For private and internal projects: If you want to use your own Docker images for docker-in-docker there are a few things you need to do in addition to the steps in the [docker-in-docker](#use-docker-in-docker-workflow-with-docker-executor) section: 1. Update the `image` and `service` to point to your registry. -1. Add a service [alias](https://docs.gitlab.com/ee/ci/yaml/#servicesalias) +1. Add a service [alias](https://docs.gitlab.com/ee/ci/yaml/#servicesalias). -Below is an example of how your `.gitlab-ci.yml` should look like, assuming you have it configured with [TLS enabled](#tls-enabled): +Below is an example of what your `.gitlab-ci.yml` should look like, +assuming you have it configured with [TLS enabled](#tls-enabled): ```yaml build: @@ -603,7 +604,7 @@ Below is an example of how your `.gitlab-ci.yml` should look like, assuming you - docker run my-docker-image /script/to/run/tests ``` -If you forget to set the service alias the `docker:19.03.1` image won't find the +If you forget to set the service alias, the `docker:19.03.1` image won't find the `dind` service, and an error like the following is thrown: ```sh |