diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-04 09:08:18 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-04 09:08:18 +0000 |
commit | 97b2a3cc7c3fab546c60229c9d058fa1472724ac (patch) | |
tree | 2e41230c24957600feedb4abdd329b3f0d41105e | |
parent | dee95b0d9109ef801e53540a115473e1ba51b55c (diff) | |
parent | aed3fadb556a120ad4b4efda173c460d0af9bded (diff) | |
download | gitlab-ce-97b2a3cc7c3fab546c60229c9d058fa1472724ac.tar.gz |
Merge branch 'docs-remove-DOCKER_AUTH_CONFIG' into 'master'
Replace the variable DOCKER_AUTH_LOGIN with DOCKER_AUTH_CONFIG
See merge request gitlab-org/gitlab-ce!30339
-rw-r--r-- | doc/ci/docker/using_docker_images.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index e012f4f8595..816bd35018a 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -489,17 +489,17 @@ runtime. ### Using statically-defined credentials There are two approaches that you can take in order to access a private registry. Both require setting the environment variable -`DOCKER_AUTH_LOGIN` with appropriate authentication info. +`DOCKER_AUTH_CONFIG` with appropriate authentication info. 1. Per-job: To configure one job to access a private registry, add - `DOCKER_AUTH_LOGIN` as a job variable. + `DOCKER_AUTH_CONFIG` as a job variable. 1. Per-runner: To configure a Runner so all its jobs can access a - private registry, add `DOCKER_AUTH_LOGIN` to the environment in the + private registry, add `DOCKER_AUTH_CONFIG` to the environment in the Runner's configuration. See below for examples of each. -#### Determining your `DOCKER_AUTH_LOGIN` data +#### Determining your `DOCKER_AUTH_CONFIG` data As an example, let's assume that you want to use the `registry.example.com:5000/private/image:latest` image which is private and requires you to login into a private container registry. |