summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-05-21 20:15:42 -0500
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-05-22 14:54:29 -0500
commit27067e565fb5c425b307a8e28c5dcab95fa8b0bf (patch)
treed725370519b9ecebc2590b3a12188e6feeefce89
parente9817f21f4baa20244095f56dd0d45b5c2e9c5dc (diff)
downloadgitlab-ce-27067e565fb5c425b307a8e28c5dcab95fa8b0bf.tar.gz
Clarify how the Registry is enabled in Omnibus
-rw-r--r--doc/administration/container_registry.md17
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 21f086792cd..435e7f627b0 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -34,14 +34,17 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
If you are using Omnibus, you have to bare in mind the following:
- The container Registry will be enabled by default if GitLab is configured
- with HTTPS and it will listen on port `5005`. If you want the Registry to
- listen on a port other than `5005`, read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+ with HTTPS in new and existing installations (no action is required from the
+ administrator), and it will listen on port `5005`. If you wish to change it,
+ read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
on how to achieve that. You will also have to configure your firewall to allow
- connections to that port.
-- The container Registry works under HTTPS by default. Using HTTP is possible
- but not recommended and out of the scope of this document.
- [See the insecure Registry documentation][docker-insecure] if you want to
- implement this.
+ incoming connections to that port.
+
+>**Note:**
+The container Registry works under HTTPS by default. Using HTTP is possible
+but not recommended and out of the scope of this document.
+Read the [insecure Registry documentation][docker-insecure] if you want to
+implement this.
---