summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbubakar Siddiq Ango <h4xx22live@gmail.com>2019-02-11 09:19:08 +0000
committerAbubakar Siddiq Ango <h4xx22live@gmail.com>2019-02-11 09:19:08 +0000
commit52628dcff92ce432e4adcfa9b959d564ff8afd49 (patch)
treec7ff3b3968bf90119a1ab3de31b22d987940b3c3
parent1a1f28fe2ab0de454d0c3406a68d0c6fa3d39f60 (diff)
downloadgitlab-ce-docs-abuango-registry-selfsigned-certs.tar.gz
Update on using self-signed certs with registrydocs-abuango-registry-selfsigned-certs
-rw-r--r--doc/administration/container_registry.md13
1 files changed, 10 insertions, 3 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index db0b3e1270c..975d9025b09 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -600,9 +600,16 @@ The Docker daemon running the command expects a cert signed by a recognized CA,
thus the error above.
While GitLab doesn't support using self-signed certificates with Container
-Registry out of the box, it is possible to make it work if you follow
-[Docker's documentation][docker-insecure-self-signed]. You may find some additional
-information in [issue 18239][ce-18239].
+Registry out of the box, it is possible to make it work by [instructing the docker-daemon to trust the self-signed certificates][docker-insecure-self-signed], mounting the docker-daemon and setting `privileged = false` in the runner's `config.toml`. Setting `privileged = true` takes precedence over the docker-daemon.
+
+```
+ [runners.docker]
+ image = "ruby:2.1"
+ privileged = false
+ volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
+```
+
+You may find some additional information in [issue 18239][ce-18239].
## Troubleshooting