Introduce container_registry_path_with_namespace
This commit is contained in:
parent
d1fdefeecd
commit
77cb8ec4d1
|
@ -309,21 +309,25 @@ class Project < ActiveRecord::Base
|
|||
@repository ||= Repository.new(path_with_namespace, self)
|
||||
end
|
||||
|
||||
def container_registry_path_with_namespace
|
||||
path_with_namespace.downcase
|
||||
end
|
||||
|
||||
def container_registry_repository
|
||||
return unless Gitlab.config.registry.enabled
|
||||
|
||||
@container_registry_repository ||= begin
|
||||
token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace.downcase)
|
||||
token = Auth::ContainerRegistryAuthenticationService.full_access_token(container_registry_path_with_namespace)
|
||||
url = Gitlab.config.registry.api_url
|
||||
host_port = Gitlab.config.registry.host_port
|
||||
registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
|
||||
registry.repository(path_with_namespace.downcase)
|
||||
registry.repository(container_registry_path_with_namespace)
|
||||
end
|
||||
end
|
||||
|
||||
def container_registry_repository_url
|
||||
if Gitlab.config.registry.enabled
|
||||
"#{Gitlab.config.registry.host_port}/#{path_with_namespace.downcase}"
|
||||
"#{Gitlab.config.registry.host_port}/#{container_registry_path_with_namespace}"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -784,6 +784,15 @@ describe Project, models: true do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#container_registry_path_with_namespace' do
|
||||
let(:project) { create(:empty_project, path: 'PROJECT') }
|
||||
|
||||
subject { project.container_registry_path_with_namespace }
|
||||
|
||||
it { is_expected.not_to eq(project.path_with_namespace) }
|
||||
it { is_expected.to eq(project.path_with_namespace.downcase) }
|
||||
end
|
||||
|
||||
describe '#container_registry_repository' do
|
||||
let(:project) { create(:empty_project) }
|
||||
|
||||
|
@ -792,13 +801,6 @@ describe Project, models: true do
|
|||
subject { project.container_registry_repository }
|
||||
|
||||
it { is_expected.not_to be_nil }
|
||||
|
||||
context 'for uppercase project path' do
|
||||
let(:project) { create(:empty_project, path: 'PROJECT') }
|
||||
|
||||
it { expect(subject.path).not_to end_with(project.path) }
|
||||
it { expect(subject.path).to end_with(project.path.downcase) }
|
||||
end
|
||||
end
|
||||
|
||||
describe '#container_registry_repository_url' do
|
||||
|
@ -817,13 +819,6 @@ describe Project, models: true do
|
|||
end
|
||||
|
||||
it { is_expected.not_to be_nil }
|
||||
|
||||
context 'for uppercase project path' do
|
||||
let(:project) { create(:empty_project, path: 'PROJECT') }
|
||||
|
||||
it { is_expected.not_to end_with(project.path) }
|
||||
it { is_expected.to end_with(project.path.downcase) }
|
||||
end
|
||||
end
|
||||
|
||||
context 'for disabled registry' do
|
||||
|
|
Loading…
Reference in New Issue