Merge pull request #10423 from dmcgowan/v2-registry-fix-single-names
Allow single name component repository namesmaster
						commit
						c5c507bb14
					
				| 
						 | 
				
			
			@ -11,9 +11,9 @@ import "regexp"
 | 
			
		|||
// separated by one period, dash or underscore.
 | 
			
		||||
var RepositoryNameComponentRegexp = regexp.MustCompile(`[a-z0-9]+(?:[._-][a-z0-9]+)*`)
 | 
			
		||||
 | 
			
		||||
// RepositoryNameRegexp builds on RepositoryNameComponentRegexp to allow 2 to
 | 
			
		||||
// RepositoryNameRegexp builds on RepositoryNameComponentRegexp to allow 1 to
 | 
			
		||||
// 5 path components, separated by a forward slash.
 | 
			
		||||
var RepositoryNameRegexp = regexp.MustCompile(`(?:` + RepositoryNameComponentRegexp.String() + `/){1,4}` + RepositoryNameComponentRegexp.String())
 | 
			
		||||
var RepositoryNameRegexp = regexp.MustCompile(`(?:` + RepositoryNameComponentRegexp.String() + `/){0,4}` + RepositoryNameComponentRegexp.String())
 | 
			
		||||
 | 
			
		||||
// TagNameRegexp matches valid tag names. From docker/docker:graph/tags.go.
 | 
			
		||||
var TagNameRegexp = regexp.MustCompile(`[\w][\w.-]{0,127}`)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -51,6 +51,14 @@ func TestRouter(t *testing.T) {
 | 
			
		|||
			RequestURI: "/v2/",
 | 
			
		||||
			Vars:       map[string]string{},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			RouteName:  RouteNameManifest,
 | 
			
		||||
			RequestURI: "/v2/foo/manifests/bar",
 | 
			
		||||
			Vars: map[string]string{
 | 
			
		||||
				"name": "foo",
 | 
			
		||||
				"tag":  "bar",
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			RouteName:  RouteNameManifest,
 | 
			
		||||
			RequestURI: "/v2/foo/bar/manifests/tag",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue