diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-22 10:30:22 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-22 10:30:22 +0000 |
| commit | e1917b56c67dee6eaf0f94e8f857dee69a73e96d (patch) | |
| tree | afdf53f78424b4eec7f12ad72900bfb769e7f358 /doc | |
| parent | df8dd6dea39a45b18dd5b05b396a1cc30ab1ff85 (diff) | |
| parent | 21fd52bc5fed122a867e69f8b36639249ef2d9b0 (diff) | |
| download | gitlab-ce-e1917b56c67dee6eaf0f94e8f857dee69a73e96d.tar.gz | |
Merge branch 'hotfix/better-container-registry-documentation' into 'master'
Add some docs for Docker Registry configuration - Relatively important for anyone installing from source
There have been a few issues created because of the lack of documentation for how to configure Docker Registry when installing from source, specifically what the `realm` needs to be and the `service`
These 2 bits of info will stop a lot of headaches :+1:
Issues:
https://gitlab.com/gitlab-org/gitlab-ce/issues/17957
https://gitlab.com/gitlab-org/gitlab-ce/issues/17991
See merge request !4738
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/container_registry.md | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md index de225385c7a..d5d43303454 100644 --- a/doc/administration/container_registry.md +++ b/doc/administration/container_registry.md @@ -85,6 +85,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_registry` 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. |