summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-21 09:20:06 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-21 09:20:06 +0000
commitda1e8ee4420a8480785c351ad6edd1bcafd96d9b (patch)
tree55c0a1efa79f475f8d5fd217dffbb62464d870f0
parent96629402fffccdb996ff5b660996f6d59be627c7 (diff)
parent869bce99af3018d0dedd9fda85ef580e7b27a733 (diff)
downloadgitlab-ce-da1e8ee4420a8480785c351ad6edd1bcafd96d9b.tar.gz
Merge branch 'docs-jonfen-contribution' into 'master'
Update container_registry.md to handle CA Bundle certs and validation See merge request gitlab-org/gitlab-ce!31891
-rw-r--r--doc/administration/container_registry.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index d0adeb89543..c90a633ec5a 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -137,6 +137,15 @@ otherwise you will run into conflicts.
1. Save the file and [reconfigure GitLab][] for the changes to take effect.
+1. Validate using:
+
+ ```sh
+ openssl s_client -showcerts -servername gitlab.example.com -connect gitlab.example.com:443 > cacert.pem
+ ```
+
+NOTE: **Note:**
+If your certificate provider provides the CA Bundle certificates, append them to the TLS certificate file.
+
**Installations from source**
1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and