Commit 87b7a780 authored by DJ Mountney's avatar DJ Mountney

Merge branch 'mrchrisw/support-reg-debug' into 'master'

Add support for registry debug

Add support for the debug configuration value to troubleshoot registry issues

```
http:
  debug:
    addr: localhost:5001
``` 

https://docs.docker.com/registry/configuration/#/debug

See merge request !1002
parents 55fe9163 0f8a25fa
......@@ -3,6 +3,10 @@
The latest version of this file can be found at the master branch of the
omnibus-gitlab repository.
8.13.0
- Add support for registry debug addr configuration
8.12.0
- Add support for using NFS root_squash for storage directories d5cf0d1d
......
......@@ -369,6 +369,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# registry['log_directory'] = "/var/log/gitlab/registry"
# registry['log_level'] = "info"
# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
# registry['debug_addr'] = "localhost:5001"
# registry['storage_delete_enabled'] = true
# # Registry backend storage, see http://docs.gitlab.com/ce/administration/container_registry.html#container-registry-storage-driver
# registry['storage'] = {
......
......@@ -499,6 +499,7 @@ default['gitlab']['registry']['log_level'] = "info"
default['gitlab']['registry']['rootcertbundle'] = nil
default['gitlab']['registry']['storage_delete_enabled'] = true
default['gitlab']['registry']['storage'] = nil
default['gitlab']['registry']['debug_addr'] = nil
####
# Nginx
......
......@@ -10,6 +10,10 @@ http:
secret: "<%= @http_secret %>"
headers:
X-Content-Type-Options: [nosniff]
<% if @debug_addr %>
debug:
addr: <%= @debug_addr %>
<% end %>
health:
storagedriver:
enabled: true
......
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