diff options
author | Stan Hu <stanhu@gmail.com> | 2016-06-01 22:06:25 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-06-01 22:06:25 +0000 |
commit | 3b53016f5978164ceb6b604d9ee84a7d479add0e (patch) | |
tree | c54d6d4b10bfc0a4c233e92203fef6465985dc35 | |
parent | 07fb3815fe94b212fbd781dcaac2a30ca79b9098 (diff) | |
parent | 77cb8ec4d14e3a8b03164423176b3b95977ee809 (diff) | |
download | gitlab-ce-3b53016f5978164ceb6b604d9ee84a7d479add0e.tar.gz |
Merge branch 'downcase-registry-repository' into 'master'
Use downcased path to container repository as this is expected path by Docker
## What does this MR do?
Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17959
See merge request !4420
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/models/project.rb | 10 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 848aaa8506e..d1cde40c1c7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,7 @@ v 8.9.0 (unreleased) - Fix bug when sorting issues by milestone due date and filtering by two or more labels - Remove 'main language' feature - Pipelines can be canceled only when there are running builds + - Use downcased path to container repository as this is expected path by Docker - Projects pending deletion will render a 404 page - Measure queue duration between gitlab-workhorse and Rails - Make authentication service for Container Registry to be compatible with < Docker 1.11 diff --git a/app/models/project.rb b/app/models/project.rb index c1d9bae44c9..525a82c7534 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -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) + 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) + 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}" + "#{Gitlab.config.registry.host_port}/#{container_registry_path_with_namespace}" end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 6c1b0393682..338a4c3d3f0 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -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) } |