diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-22 11:42:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-22 11:42:02 +0000 |
| commit | e4937e2800c6405e3f9f50abec4b5b0caf03dae1 (patch) | |
| tree | e509e18a549ac325d3a5bc629341097511d8462d | |
| parent | 1eb4f20ca1487948fda6a6e8b80fa719d16febbd (diff) | |
| parent | 51ef233e25d6b9cfed16b8b3a5b532e429993dec (diff) | |
| download | gitlab-ce-e4937e2800c6405e3f9f50abec4b5b0caf03dae1.tar.gz | |
Merge branch 'patch-3' into 'master'
Fix docker.sock reference in config.toml
## What does this MR do?
`config.toml` sample did not correctly represent the `/var/run/docker.sock` mapping, causing it to be created as a volume instead.
## Why was this MR needed?
It was broken.
See merge request !5172
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 0f64137a8a9..79bbe8421c6 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -188,7 +188,7 @@ In order to do that, follow the steps: image = "docker:latest" privileged = false disable_cache = false - volumes = ["/var/run/docker.sock", "/cache"] + volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"] [runners.cache] Insecure = false ``` |