Commit c9b992db authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'patch-39' into 'master'

In using_docker_images.md, explicitly document that manually Base64-encoded...

See merge request gitlab-org/gitlab!20925
parents 3e51cc77 521518a8
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment