Skip to content
Snippets Groups Projects
Commit c01f99b7 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

Fixes suggested by Kamil

parent f896a4e0
No related branches found
No related tags found
No related merge requests found
Loading
@@ -31,15 +31,9 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
Loading
@@ -31,15 +31,9 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
   
**Omnibus GitLab installations** **Omnibus GitLab installations**
   
1. Open `/etc/gitlab/gitlab.rb` and edit or add the following line: All you have to do is configure the domain name under which the Container
Registry will listen to. Read [#container-registry-domain-configuration](#container-registry-domain-configuration)
```ruby and pick one of the two options that fits your case.
gitlab_rails['registry_enabled'] = true
```
1. The next step is to configure the domain name under which the Container
Registry will listen to. Read [#container-registry-domain-configuration](#container-registry-domain-configuration)
and pick one of the two options that fits your case.
   
>**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
Loading
@@ -124,15 +118,11 @@ GitLab from source respectively.
Loading
@@ -124,15 +118,11 @@ GitLab from source respectively.
path to the existing TLS certificate and key used by GitLab: path to the existing TLS certificate and key used by GitLab:
   
```ruby ```ruby
gitlab_rails['registry_host'] = "gitlab.example.com"
gitlab_rails['registry_port'] = "4567"
# The following setting is needed for NGINX
registry_external_url 'https://gitlab.example.com:4567' registry_external_url 'https://gitlab.example.com:4567'
``` ```
   
Note how the `registry_external_url` is listening on HTTPS and is a Note how the `registry_external_url` is listening on HTTPS under the
conjunction of `registry_host` and `registry_port`. existing GitLab URL, but on a different port.
   
If your TLS certificate is not in `/etc/gitlab/ssl/gitlab.example.com.crt` If your TLS certificate is not in `/etc/gitlab/ssl/gitlab.example.com.crt`
and key not in `/etc/gitlab/ssl/gitlab.example.com.key` uncomment the lines and key not in `/etc/gitlab/ssl/gitlab.example.com.key` uncomment the lines
Loading
@@ -197,12 +187,11 @@ Let's assume that you want the container Registry to be accessible at
Loading
@@ -197,12 +187,11 @@ Let's assume that you want the container Registry to be accessible at
1. Once the TLS certificate is in place, edit `/etc/gitlab/gitlab.rb` with: 1. Once the TLS certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
   
```ruby ```ruby
gitlab_rails['registry_host'] = "registry.gitlab.example.com"
# The following setting is needed for NGINX
registry_external_url 'https://registry.gitlab.example.com' registry_external_url 'https://registry.gitlab.example.com'
``` ```
   
Note how the `registry_external_url` is listening on HTTPS.
1. Save the file and [reconfigure GitLab][] for the changes to take effect. 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
   
> **Note:** > **Note:**
Loading
@@ -249,12 +238,10 @@ Registry application itself.
Loading
@@ -249,12 +238,10 @@ Registry application itself.
   
**Omnibus GitLab** **Omnibus GitLab**
   
1. Open `/etc/gitlab/gitlab.rb` and set `gitlab_rails['registry_enabled']` to 1. Open `/etc/gitlab/gitlab.rb` and set `registry['enable']` to `false`:
`false` and comment out the `registry_external_url`:
   
```ruby ```ruby
gitlab_rails['registry_enabled'] = false registry['enable'] = false
# registry_external_url 'https://registry.gitlab.example.com'
``` ```
   
1. Save the file and [reconfigure GitLab][] for the changes to take effect. 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
Loading
@@ -326,7 +313,6 @@ This path is accessible to:
Loading
@@ -326,7 +313,6 @@ This path is accessible to:
   
- the user running the Container Registry daemon, - the user running the Container Registry daemon,
- the user running GitLab - the user running GitLab
- and to the user running the Nginx web server.
   
> **Warning** You should confirm that all GitLab, Registry and web server users > **Warning** You should confirm that all GitLab, Registry and web server users
have access to this directory. have access to this directory.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment