Commit 67954e8b authored by Suzanne Selhorn's avatar Suzanne Selhorn

Merge branch 'docs-container-registry-oldversion-noletencrypt' into 'master'

Docs for container registry on <12.5 or no LE

See merge request gitlab-org/gitlab!28716
parents a8007785 9f48a3d5
...@@ -18,12 +18,17 @@ You can read more about the Docker Registry at ...@@ -18,12 +18,17 @@ You can read more about the Docker Registry at
**Omnibus GitLab installations** **Omnibus GitLab installations**
If you are using the Omnibus GitLab built in [Let's Encrypt integration](https://docs.gitlab.com/omnibus/settings/ssl.html#lets-encrypt-integration), as of GitLab 12.5, the Container Registry will be automatically enabled on port 5050 of the default domain. If you are using the Omnibus GitLab built-in [Let's Encrypt integration](https://docs.gitlab.com/omnibus/settings/ssl.html#lets-encrypt-integration), as of GitLab 12.5, the Container Registry will be automatically enabled on port 5050 of the default domain.
If you would like to use a separate domain, all you have to do is configure the domain name under which the Container If you are not using GitLab 12.5 or later, or do not use GitLab's built-in Let's Encrypt
Registry will listen to. Read integration, the GitLab Container Registry must be enabled and
[#container-registry-domain-configuration](#container-registry-domain-configuration) [configured to use an external domain](#container-registry-domain-configuration).
and pick one of the two options that fits your case.
To enable the GitLab Container Registry on your *existing* GitLab domain, refer to the section on
[configuring Container Registry to use an existing domain](#configure-container-registry-under-an-existing-gitlab-domain).
To use a *separate* domain with your Container Registry, refer to the section on
[configuring Container Registry under its own domain](#configure-container-registry-under-its-own-domain).
NOTE: **Note:** NOTE: **Note:**
The container registry works under HTTPS by default. Using HTTP is possible The container registry works under HTTPS by default. Using HTTP is possible
......
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