Merge pull request #2117 from fuweid/bugfix_add_new_separator_for_ref…

…erence_parse

bugfix: extend reference separator

pkg/reference/parse_test.go

@@ -131,6 +131,22 @@ func TestParse(t *testing.T) {
 			input:    "  ",
 			expected: nil,
 			err:      ErrInvalid,
+		}, {
+			name:     "With __ as separator in name",
+			input:    "new__separator",
+			expected: namedReference{"new__separator"},
+		}, {
+			name:  "With __ as separator in name and tag",
+			input: "new__separator:build__testing",
+			expected: taggedReference{
+				Named: namedReference{"new__separator"},
+				tag:   "build__testing",
+			},
+		}, {
+			name:     "Invalid separator ___",
+			input:    "new__separator___invalid",
+			expected: nil,
+			err:      ErrInvalid,
 		},
 	} {
 		ref, err := Parse(tc.input)

pkg/reference/regexp.go

@@ -5,10 +5,12 @@ import "regexp"
 //
 // v1 org.opencontainers.image.ref.name:
 //
+// NOTE: extend separator with "__" here to compatibility with moby
+//
 // 	ref       ::= component ("/" component)*
 // 	component ::= alphanum (separator alphanum)*
 // 	alphanum  ::= [A-Za-z0-9]+
-// 	separator ::= [-._:@+] | "--"
+// 	separator ::= [-._:@+] | "--" | "__"
 //
 // In the image-spec, there is no definition about Tag.
 //
@@ -19,7 +21,7 @@ import "regexp"
 var (
 	regAlphanum = expression(`[A-Za-z0-9]`)
 
-	regSeparator = expression(`([-._:@+]|--)`)
+	regSeparator = expression(`([-._:@+]|--|__)`)
 
 	regComponent = group(
 		oneOrMore(regAlphanum),