summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-07 13:21:05 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-07 13:29:46 +0200
commit6c81c78766a3b2a696b05cc7af40533d2669ede7 (patch)
tree1d5295129592884911e5df16f5bff03386d99f45
parentf399ef43b84a29851b8603063dfd134f07a77542 (diff)
downloadgitlab-ce-6c81c78766a3b2a696b05cc7af40533d2669ede7.tar.gz
Add docker registry
-rw-r--r--config/initializers/1_settings.rb37
1 files changed, 37 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2b989015279..b8231a72c63 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -27,6 +27,30 @@ class Settings < Settingslogic
].join('')
end
+ def build_registry_api_url
+ if on_standard_port?(registry)
+ custom_port = nil
+ else
+ custom_port = ":#{registry.port}"
+ end
+ [ registry.protocol,
+ "://",
+ registry.host,
+ custom_port
+ ].join('')
+ end
+
+ def build_registry_host_with_port
+ if on_standard_port?(registry)
+ custom_port = nil
+ else
+ custom_port = ":#{registry.port}"
+ end
+ [ registry.host,
+ custom_port
+ ].join('')
+ end
+
def build_gitlab_shell_ssh_path_prefix
user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
@@ -217,6 +241,19 @@ Settings.artifacts['path'] = File.expand_path(Settings.artifacts['path']
Settings.artifacts['max_size'] ||= 100 # in megabytes
#
+# Registry
+#
+Settings['registry'] ||= Settingslogic.new({})
+Settings.registry['registry'] = false if Settings.registry['enabled'].nil?
+Settings.registry['path'] = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
+Settings.registry['host'] ||= "example.com"
+Settings.registry['https'] = false if Settings.registry['https'].nil?
+Settings.registry['port'] ||= Settings.registry.https ? 443 : 80
+Settings.registry['protocol'] ||= Settings.registry.https ? "https" : "http"
+Settings.registry['api_url'] ||= Settings.send(:build_registry_api_url)
+Settings.registry['host_port'] ||= Settings.send(:build_registry_host_with_port)
+
+#
# Git LFS
#
Settings['lfs'] ||= Settingslogic.new({})