Commit b565cfa5 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Fix remaining docs on enabling/disabling Registry

parent e955f49f
...@@ -120,22 +120,20 @@ GitLab from source respectively. ...@@ -120,22 +120,20 @@ GitLab from source respectively.
**Omnibus GitLab installations** **Omnibus GitLab installations**
>**Note:**
If you are using HTTPS in your Omnibus packages, then the Registry will be
enabled by default and exposed under port `5005`. Follow the steps below only if
you want to change the default port.
1. Your `/etc/gitlab/gitlab.rb` should contain the Registry URL as well as the 1. Your `/etc/gitlab/gitlab.rb` should contain the Registry URL as well as the
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_port'] = "4567"
gitlab_rails['registry_host'] = "gitlab.example.com" gitlab_rails['registry_host'] = "gitlab.example.com"
gitlab_rails['registry_port'] = "4567"
# The following setting is needed for NGINX # 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
conjunction of `registry_host` and `registry_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
below: below:
...@@ -213,7 +211,6 @@ certificate in addition to the URL, in this case `/etc/gitlab/gitlab.rb` will ...@@ -213,7 +211,6 @@ certificate in addition to the URL, in this case `/etc/gitlab/gitlab.rb` will
look like: look like:
> >
```ruby ```ruby
registry_external_url 'https://registry.gitlab.example.com'
registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem" registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key" registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
``` ```
...@@ -229,7 +226,6 @@ registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key" ...@@ -229,7 +226,6 @@ registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
registry: registry:
enabled: true enabled: true
host: registry.gitlab.example.com host: registry.gitlab.example.com
port: 4567
``` ```
1. Save the file and [restart GitLab][] for the changes to take effect. 1. Save the file and [restart GitLab][] for the changes to take effect.
...@@ -246,31 +242,36 @@ docker login registry.gitlab.example.com ...@@ -246,31 +242,36 @@ docker login registry.gitlab.example.com
## Disable Container Registry site-wide ## Disable Container Registry site-wide
>**Note:**
Disabling the Registry in the Rails GitLab application as set by the following
steps, will not remove any existing Docker images. This is handled by the
Registry application itself.
**Omnibus GitLab** **Omnibus GitLab**
```ruby 1. Open `/etc/gitlab/gitlab.rb` and set `gitlab_rails['registry_enabled']` to
gitlab_rails['registry_enabled'] = true `false` and comment out the `registry_external_url`:
```
``` ```ruby
# gitlab_rails['registry_port'] = "5005" gitlab_rails['registry_enabled'] = false
# gitlab_rails['registry_host'] = "registry.gitlab.example.com" # registry_external_url 'https://registry.gitlab.example.com'
# gitlab_rails['registry_api_url'] = "http://localhost:5000" ```
# gitlab_rails['registry_key_path'] = "/var/opt/gitlab/gitlab-rails/certificate.key"
# gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry" 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
# gitlab_rails['registry_issuer'] = "omnibus-gitlab-issuer"
---
# Settings used by Registry application
# registry['enable'] = true **Installations from source**
# registry['username'] = "registry"
# registry['group'] = "registry" 1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
# registry['uid'] = nil set `enabled` to `false`:
# registry['gid'] = nil
# registry['dir'] = "/var/opt/gitlab/registry" ```
# registry['log_directory'] = "/var/log/gitlab/registry" registry:
# registry['log_level'] = "info" enabled: false
# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt" ```
```
1. Save the file and [restart GitLab][] for the changes to take effect.
## Disable Container Registry per project ## Disable Container Registry per project
...@@ -280,9 +281,9 @@ on how to achieve that. ...@@ -280,9 +281,9 @@ on how to achieve that.
## Disable Container Registry for new projects site-wide ## Disable Container Registry for new projects site-wide
The Registry is enabled by default on all new projects. To disable this function If the Container Registry is enabled, then it will be available on all new
and let the owners of a project to enable Registry by themselves, follow the projects. To disable this function and let the owners of a project to enable
steps below. the Container Registry by themselves, follow the steps below.
--- ---
......
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