Correctly extract image name when using custom hub.

render/mapping.go

@@ -540,12 +540,14 @@ func MapPod2Service(n RenderableNode, _ report.Networks) RenderableNodes {
 	return result
 }
 
+var dockerImageMatch = regexp.MustCompile(`(?:(?P<reg>[^/]+)/)?(?P<name>[^/]+/[^:]+):(?P<version>.*)`)
+
 func imageNameWithoutVersion(name string) string {
-	parts := strings.SplitN(name, ":", 2)
-	if len(parts) == 2 {
-		return parts[0]
+	mapping := dockerImageMatch.FindStringSubmatch(name)
+	if mapping == nil {
+		return name
 	}
-	return name
+	return mapping[2]
 }
 
 // MapContainerImage2Name maps container images RenderableNodes to

render/mapping_internal_test.go

@@ -0,0 +1,23 @@
+package render
+
+import (
+	"testing"
+)
+
+func TestDockerImageRegexp(t *testing.T) {
+	for _, input := range []struct{ in, reg, image, ver string }{
+		{"foo/bar:baz", "", "foo/bar", "baz"},
+		{"reg:123/foo/bar:baz", "reg:123", "foo/bar", "baz"},
+		{"docker-registry.domain.name:5000/repo/image1:ver", "docker-registry.domain.name:5000", "repo/image1", "ver"},
+	} {
+		mapping := dockerImageMatch.FindStringSubmatch(input.in)
+		if mapping == nil {
+			t.Fatalf("No match: %v", input)
+		}
+		if mapping[1] != input.reg ||
+			mapping[2] != input.image ||
+			mapping[3] != input.ver {
+			t.Fatalf("Bad regexp: %v, %v", mapping, input)
+		}
+	}
+}