mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 02:00:43 +00:00
Correctly extract image name when using custom hub.
This commit is contained in:
@@ -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
|
||||
|
||||
20
render/mapping_internal_test.go
Normal file
20
render/mapping_internal_test.go
Normal 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user