diff options
| author | Evan Read <eread@gitlab.com> | 2019-06-20 23:37:44 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-06-20 23:37:44 +0000 |
| commit | 4aedbd18f08269b17812c86213d50b2e63612863 (patch) | |
| tree | 59c4166435ea549b076a28a94694d57b4c1abd6c | |
| parent | 49bf73f9a4294323646168580fe2a77b141052b9 (diff) | |
| parent | 030059ba9f8582a8f3622c5abd47a38c5d87d693 (diff) | |
| download | gitlab-ce-4aedbd18f08269b17812c86213d50b2e63612863.tar.gz | |
Merge branch 'patch-28' into 'master'
using_docker_images.md: fix config.json path
See merge request gitlab-org/gitlab-ce!29791
| -rw-r--r-- | doc/ci/docker/using_docker_images.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index f6b84dca734..e4dc289dbdb 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -478,7 +478,7 @@ To define which should be used, the GitLab Runner process reads the configuratio - A [variable](../variables/README.md#gitlab-cicd-environment-variables) in `.gitlab-ci.yml`. - A project's variables stored on the projects **Settings > CI/CD** page. - `DOCKER_AUTH_CONFIG` variable provided as environment variable in `config.toml` of the Runner. -- `config.json` file placed in `$HOME/docker` directory of the user running GitLab Runner process. +- `config.json` file placed in `$HOME/.docker` directory of the user running GitLab Runner process. If the `--user` flag is provided to run the GitLab Runner child processes as unprivileged user, the home directory of the main GitLab Runner process user will be used. |