Commit 4aedbd18 authored by Evan Read's avatar Evan Read

Merge branch 'patch-28' into 'master'

using_docker_images.md: fix config.json path

See merge request gitlab-org/gitlab-ce!29791
parents 49bf73f9 030059ba
...@@ -478,7 +478,7 @@ To define which should be used, the GitLab Runner process reads the configuratio ...@@ -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 [variable](../variables/README.md#gitlab-cicd-environment-variables) in `.gitlab-ci.yml`.
- A project's variables stored on the projects **Settings > CI/CD** page. - 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. - `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, 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. the home directory of the main GitLab Runner process user will be used.
......
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