summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-11 05:06:59 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-11 05:06:59 +0000
commit2e8a9650b38cfaa80d18dc463b42ac11521f0ebc (patch)
tree44edbf03425e6699822a26439446ee01417dcc70 /doc
parent928edde2e6af7689b42453998bd2d129a352877d (diff)
parent9f6ceed554319592c8bb47421c4a2654178e3453 (diff)
downloadgitlab-ce-2e8a9650b38cfaa80d18dc463b42ac11521f0ebc.tar.gz
Merge branch 'patch-3' into 'master'
Update container_registry.md ## What does this MR do? Add a warning about what ports to choose for the external registry URL ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? It would have saved me about 3 hours if this line was in the document. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? It's just a one-line documentation addition. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5238
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/container_registry.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index b5db575477c..28c4c7c86ca 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -121,6 +121,10 @@ Registry is exposed to the outside world is `4567`, here is what you need to set
in `gitlab.rb` or `gitlab.yml` if you are using Omnibus GitLab or installed
GitLab from source respectively.
+>**Note:**
+Be careful to choose a port different than the one that Registry listens to (`5000` by default),
+otherwise you will run into conflicts .
+
---
**Omnibus GitLab installations**