summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-10-31 08:56:37 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-10-31 08:56:37 +0000
commit696f09c7bf15c090c46a7d9abe14e0c769576db2 (patch)
treed4b3551773a12c35398cb159263de45f25c52eec
parent837369878a4a6f1b5e4bf44285e9ced0983ee6b1 (diff)
parenteecb52e14585638b8538cfbbdef10283eeda94e4 (diff)
downloadgitlab-ce-696f09c7bf15c090c46a7d9abe14e0c769576db2.tar.gz
Merge branch 'patch-4' into 'master'
Improve docs on `gitlab-ci-token` user See merge request !6002
-rw-r--r--doc/ci/docker/using_docker_build.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 79bbe8421c6..a313c31e7ee 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -242,10 +242,10 @@ docker-in-docker on your runners, this is how your `.gitlab-ci.yml` could look:
- docker push registry.example.com/group/project:latest
```
-You have to use the credentials of the special `gitlab-ci-token` user with its
-password stored in `$CI_BUILD_TOKEN` in order to push to the Registry connected
-to your project. This allows you to automate building and deployment of your
-Docker images.
+You have to use the special `gitlab-ci-token` user created for you in order to
+push to the Registry connected to your project. Its password is provided in the
+`$CI_BUILD_TOKEN` variable. This allows you to automate building and deployment
+of your Docker images.
Here's a more elaborate example that splits up the tasks into 4 pipeline stages,
including two tests that run in parallel. The build is stored in the container