Correctly extract image name when using custom hub.

This commit is contained in:
Tom Wilkie
2016-01-15 07:54:46 -08:00
parent d3ffd85af5
commit 984fd528c0
2 changed files with 25 additions and 4 deletions

View File

@@ -541,11 +541,12 @@ func MapPod2Service(n RenderableNode, _ report.Networks) RenderableNodes {
}
func imageNameWithoutVersion(name string) string {
parts := strings.SplitN(name, ":", 2)
if len(parts) == 2 {
return parts[0]
parts := strings.SplitN(name, "/", 3)
if len(parts) == 3 {
name = fmt.Sprintf("%s/%s", parts[1], parts[2])
}
return name
parts = strings.SplitN(name, ":", 2)
return parts[0]
}
// MapContainerImage2Name maps container images RenderableNodes to

View File

@@ -0,0 +1,20 @@
package render
import (
"testing"
)
func TestDockerImageName(t *testing.T) {
for _, input := range []struct{ in, name string }{
{"foo/bar", "foo/bar"},
{"foo/bar:baz", "foo/bar"},
{"reg:123/foo/bar:baz", "foo/bar"},
{"docker-registry.domain.name:5000/repo/image1:ver", "repo/image1"},
{"foo", "foo"},
} {
name := imageNameWithoutVersion(input.in)
if name != input.name {
t.Fatalf("%s: %s != %s", input.in, name, input.name)
}
}
}