summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalasankar C <balasankar@gitlab.com>2017-07-24 21:31:33 +0530
committerBalasankar C <balasankar@gitlab.com>2017-07-24 21:31:33 +0530
commit9ac39e008a0fbd5d54bade0fb75741bd73507cb7 (patch)
tree1ee218d17fdce34ac2c6b68ce5592342fc148329
parent332b0787117af8902cc7bd6b418b0be0d247339e (diff)
downloadgitlab-ce-update-external-registry-documentation.tar.gz
-rw-r--r--doc/administration/container_registry.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 3cdbf59aa04..8cb0e5b1562 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -483,13 +483,16 @@ You can use GitLab as an auth endpoint and use a non-bundled Container Registry.
1. A certificate keypair is required for GitLab and the Container Registry to
communicate securely. By default omnibus-gitlab will generate one keypair,
which is saved to `/var/opt/gitlab/gitlab-rails/etc/gitlab-registry.key`.
- However, there may be situations where you have an existing certificate and key
- and want to use that key instead. To specify a custom key, add the following to
+ When using an non-bundled Container Registry, you will need to supply a
+ custom certificate key. To do that, add the following to
`/etc/gitlab/gitlab.rb`
```ruby
gitlab_rails['registry_key_path'] = "/custom/path/to/registry-key.key"
- registry['internal_key'] = "<contents of registry-key.key file>"
+ # registry['internal_key'] should contain the contents of the custom key
+ # file. Line breaks in the key file should be marked using `\n` character
+ # Example:
+ registry['internal_key'] = "---BEGIN RSA PRIVATE KEY---\nMIIEpQIBAA\n"
```
**Note:** The file specified at `registry_key_path` gets populated with the