handle registry password with colon

engine/docker/auth/auth.go

@@ -68,11 +68,14 @@ func decode(s string) (username, password string) {
 	if err != nil {
 		return
 	}
-	parts := strings.Split(string(d), ":")
-	if len(parts) != 2 {
-		return
+	parts := strings.SplitN(string(d), ":", 2)
+	if len(parts) > 0 {
+		username = parts[0]
+	}
+	if len(parts) > 1 {
+		password = parts[1]
 	}
-	return parts[0], parts[1]
+	return
 }
 
 func hostname(s string) string {

engine/docker/auth/auth_test.go

@@ -29,6 +29,24 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func TestParseGCR(t *testing.T) {
+	got, err := ParseFile("testdata/config_gcr.json")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	want := []*engine.DockerAuth{
+		{
+			Address:  "gcr.io",
+			Username: "_json_key",
+			Password: "xxx:bar\n",
+		},
+	}
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf(diff)
+	}
+}
+
 func TestParseErr(t *testing.T) {
 	_, err := ParseString("")
 	if err == nil {
@@ -82,13 +100,6 @@ func Test_decodeInvalid(t *testing.T) {
 	}
 }
 
-func Test_decodeEmpty(t *testing.T) {
-	username, password := decode("b2N0b2NhdDpoZWxsbzp3b3JsZA==")
-	if username != "" || password != "" {
-		t.Errorf("Expect decoding error")
-	}
-}
-
 func TestEncode(t *testing.T) {
 	username := "octocat"
 	password := "correct-horse-battery-staple"

engine/docker/auth/testdata/config_gcr.json

@@ -0,0 +1,7 @@
+{
+    "auths": {
+        "gcr.io": {
+            "auth": "X2pzb25fa2V5Onh4eDpiYXIK"
+        }
+    }
+}