diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 09:06:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 09:06:21 +0300 |
commit | d07169c8ae0ebad0f23d03f01aeaf9acfa7e02d1 (patch) | |
tree | 3b92b7bd3b87929107630943a72440207c7c32de /doc/ci/docker | |
parent | 6377f3e2a7f9ac2fef10618ac4c523091eff82c0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/docker')
-rw-r--r-- | doc/ci/docker/using_docker_images.md | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 489791141ed..e58fe5e4604 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -576,8 +576,8 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`: will use the available system keystore to store the result of `docker login`. In that case, it's impossible to read `~/.docker/config.json`, so you will need to prepare the required base64-encoded version of - `${username}:${password}` manually. Open a terminal and execute the - following command: + `${username}:${password}` and create the Docker configuration JSON manually. + Open a terminal and execute the following command: ```bash echo -n "my_username:my_password" | base64 @@ -585,6 +585,18 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`: # Example output to copy bXlfdXNlcm5hbWU6bXlfcGFzc3dvcmQ= ``` + + Create the Docker JSON configuration content as follows: + + ```json + { + "auths": { + "registry.example.com:5000": { + "auth": "(Base64 content from above)" + } + } + } + ``` #### Configuring a job |