Merge pull request #190 from anchore/fix-registry-override

pkg/inventory/containers.go

@@ -18,6 +18,10 @@ func getRegistryOverrideNormalisedImageTag(imageTag, missingRegistryOverride str
 	if missingRegistryOverride != "" {
 		parts := strings.Split(imageTag, "/")
 		if len(parts) <= 2 {
+			// Check if the first part is a registry by seeing if it is a domain
+			if len(parts) > 1 && (strings.Contains(parts[0], ".") || strings.Contains(parts[0], ":")) {
+				return imageTag
+			}
 			// Assume no registry is present and only image and/or repo
 			return fmt.Sprintf("%s/%s", missingRegistryOverride, imageTag)
 		}

pkg/inventory/containers_test.go

@@ -542,6 +542,30 @@ func Test_getRegistryOverrideNormalisedImageTag(t *testing.T) {
 			},
 			want: "library/reponame/myimage:0.0.1",
 		},
+		{
+			name: "returns image tag without overridden registry if only registry and image are given, and it can be determined that registry is a domain name not a repo/library",
+			args: args{
+				imageTag:                "docker.io/myimage:0.0.1",
+				missingRegistryOverride: "custom.registry.io",
+			},
+			want: "docker.io/myimage:0.0.1",
+		},
+		{
+			name: "returns image tag without overridden registry if only registry and image are given, and it can be determined that registry is a domain name not a repo/library",
+			args: args{
+				imageTag:                "localhost:1234/myimage:0.0.1",
+				missingRegistryOverride: "custom.registry.io",
+			},
+			want: "localhost:1234/myimage:0.0.1",
+		},
+		{
+			name: "returns image tag without overridden registry if only registry and image are given, and it can be determined that registry is a domain name not a repo/library",
+			args: args{
+				imageTag:                "my.registry:1234/myimage:0.0.1",
+				missingRegistryOverride: "custom.registry.io",
+			},
+			want: "my.registry:1234/myimage:0.0.1",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {