github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-19 04:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed @LiliC's feedback.

Browse Source
This commit is contained in:
Filip Barl
2018-05-17 11:43:54 +02:00
parent 183aaea950
commit bfb20a8f40
8 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/container.go
+4 -4
View File
@@ -140,8 +140,8 @@ func (r containerWithImageNameRenderer) Render(rpt report.Report) Nodes {
if !ok {
continue
}
imageNameWithoutVersion := docker.ImageNameWithoutVersion(imageName)
imageNodeID := report.MakeContainerImageNodeID(imageNameWithoutVersion)
imageNameWithoutTag := docker.ImageNameWithoutTag(imageName)
imageNodeID := report.MakeContainerImageNodeID(imageNameWithoutTag)
c = propagateLatest(docker.ImageName, image, c)
c = propagateLatest(docker.ImageTag, image, c)
@@ -324,8 +324,8 @@ func MapContainerImage2Name(n report.Node) report.Node {
return report.Node{}
}
imageNameWithoutVersion := docker.ImageNameWithoutVersion(imageName)
n.ID = report.MakeContainerImageNodeID(imageNameWithoutVersion)
imageNameWithoutTag := docker.ImageNameWithoutTag(imageName)
n.ID = report.MakeContainerImageNodeID(imageNameWithoutTag)
return n
}
render/detailed/summary.go
+5 -5
View File
@@ -250,7 +250,7 @@ func containerNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary
base.Label = containerName
base.LabelMinor = hostName
if imageName != "" {
base.Rank = docker.ImageNameWithoutVersion(imageName)
base.Rank = docker.ImageNameWithoutTag(imageName)
} else if hostName != "" {
base.Rank = hostName
} else {
@@ -261,12 +261,12 @@ func containerNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary
func containerImageNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary {
var (
imageName, _ = n.Latest.Lookup(docker.ImageName)
imageNameWithoutVersion = docker.ImageNameWithoutVersion(imageName)
imageName, _ = n.Latest.Lookup(docker.ImageName)
imageNameWithoutTag = docker.ImageNameWithoutTag(imageName)
)
switch {
case imageNameWithoutVersion != "" && imageNameWithoutVersion != ImageNameNone:
base.Label = imageNameWithoutVersion
case imageNameWithoutTag != "" && imageNameWithoutTag != ImageNameNone:
base.Label = imageNameWithoutTag
case imageName != "" && imageName != ImageNameNone:
base.Label = imageName
default: