Commit e07b0bd2 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix/gb/update-registry-path-reference-regexp' into 'master'

Update container repository path reference

Closes #40199

See merge request gitlab-org/gitlab-ce!15417
parents 3ba84d4b 3e3c84a7
---
title: Update container repository path reference and allow using double underscore
merge_request: 15417
author:
type: fixed
...@@ -25,7 +25,7 @@ module Gitlab ...@@ -25,7 +25,7 @@ module Gitlab
# See https://github.com/docker/distribution/blob/master/reference/regexp.go. # See https://github.com/docker/distribution/blob/master/reference/regexp.go.
# #
def container_repository_name_regex def container_repository_name_regex
@container_repository_regex ||= %r{\A[a-z0-9]+(?:[-._/][a-z0-9]+)*\Z} @container_repository_regex ||= %r{\A[a-z0-9]+((?:[._/]|__|[-])[a-z0-9]+)*\Z}
end end
## ##
......
...@@ -86,6 +86,24 @@ describe ContainerRegistry::Path do ...@@ -86,6 +86,24 @@ describe ContainerRegistry::Path do
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
context 'when path contains double underscore' do
let(:path) { 'my/repository__name' }
it { is_expected.to be_valid }
end
context 'when path contains invalid separator with dot' do
let(:path) { 'some/registry-.name' }
it { is_expected.not_to be_valid }
end
context 'when path contains invalid separator with underscore' do
let(:path) { 'some/registry._name' }
it { is_expected.not_to be_valid }
end
end end
describe '#has_repository?' do describe '#has_repository?' do
......
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