github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-16 03:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: stop depending on probe code to render image names

Browse Source
This commit is contained in:
Bryan Boreham
2019-09-13 10:30:30 +00:00
parent 15467d7310
commit 4210bc76f4
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
render/container.go
View File

@@ -3,6 +3,7 @@ package render
import (
"context"
"regexp"
"strings"
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/report"
@@ -137,12 +138,10 @@ func (r containerWithImageNameRenderer) Render(ctx context.Context, rpt report.R
if !ok {
continue
}
imageName, ok := image.Latest.Lookup(docker.ImageName)
if !ok {
imageNodeID := containerImageNodeID(image)
if imageNodeID == "" {
continue
}
imageNameWithoutTag := docker.ImageNameWithoutTag(imageName)
imageNodeID := report.MakeContainerImageNodeID(imageNameWithoutTag)
c.Latest = c.Latest.Propagate(image.Latest, docker.ImageName, docker.ImageTag,
docker.ImageSize, docker.ImageVirtualSize, docker.ImageLabelPrefix+"works.weave.role")
@@ -311,6 +310,20 @@ func MapContainer2ContainerImage(n report.Node) report.Node {
return result
}
func containerImageNodeID(n report.Node) string {
imageName, ok := n.Latest.Lookup(report.DockerImageName)
if !ok {
return ""
}
parts := strings.SplitN(imageName, "/", 3)
if len(parts) == 3 {
imageName = strings.Join(parts[1:3], "/")
}
imageNameWithoutTag := strings.SplitN(imageName, ":", 2)[0]
return report.MakeContainerImageNodeID(imageNameWithoutTag)
}
// MapContainerImage2Name ignores image versions
func MapContainerImage2Name(n report.Node) report.Node {
// Propagate all pseudo nodes
@@ -318,14 +331,11 @@ func MapContainerImage2Name(n report.Node) report.Node {
return n
}
imageName, ok := n.Latest.Lookup(docker.ImageName)
if !ok {
n.ID = containerImageNodeID(n)
if n.ID == "" {
return report.Node{}
}
imageNameWithoutTag := docker.ImageNameWithoutTag(imageName)
n.ID = report.MakeContainerImageNodeID(imageNameWithoutTag)
return n
}