summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorChris Wright <chriswright96@hotmail.com>2016-06-17 09:59:12 +0000
committerChris Wright <chriswright96@hotmail.com>2016-06-17 09:59:12 +0000
commit27d2e12e69c5a7e0226b4b354ff880c939719d49 (patch)
treebffac265e39ac66b3b2d7b74f3de6fbdcba689e0 /doc/administration
parentf9bb9151b595fdc1afc1742bb51c816965908f53 (diff)
downloadgitlab-ce-27d2e12e69c5a7e0226b4b354ff880c939719d49.tar.gz
Add some docs for Docker Registry configuration
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/container_registry.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index caf9a5bef2c..d21708d6f55 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -84,6 +84,17 @@ GitLab does not ship with a Registry init file. Hence, [restarting GitLab][resta
will not restart the Registry should you modify its settings. Read the upstream
documentation on how to achieve that.
+The Docker Registry configuration will need `container_service` as the service and `https://gitlab.example.com/jwt/auth` as the realm:
+
+```
+auth:
+ token:
+ realm: https://gitlab.example.com/jwt/auth
+ service: container_registry
+ issuer: gitlab-issuer
+ rootcertbundle: /root/certs/certbundle
+```
+
## Container Registry domain configuration
There are two ways you can configure the Registry's external domain.