BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 2e8a9650 by Achilleas Pipinellis
Options

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
parents 928edde2 9f6ceed5
Showing with 4 additions and 0 deletions
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**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment