diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:15:38 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:15:38 -0500 |
| commit | 89644edc4e2a9447cc31d4f966c163316dff95fa (patch) | |
| tree | 0ac11947445720d59a302664e4e403f6fdf50b5d | |
| parent | 23d1c454108d50bbb1795b0a5855ee7ae9024e3c (diff) | |
| download | gitlab-ce-89644edc4e2a9447cc31d4f966c163316dff95fa.tar.gz | |
Bring back path to registry settings
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d935121d88b..0cef2794f4e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -183,6 +183,7 @@ production: &base # api_url: http://localhost:5000/ # key: config/registry.key # issuer: omnibus-certificate + # path: shared/registry # # 2. GitLab CI settings diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 129fd9b79f2..796b8178c5e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -254,6 +254,7 @@ Settings.registry['api_url'] ||= "http://localhost:5000/" Settings.registry['key'] ||= nil Settings.registry['issuer'] ||= nil Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':') +Settings.registry['path'] = File.expand_path(Settings.artifacts['path'] || File.join(Settings.shared['path'], "registry"), Rails.root) # # Git LFS |