github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-19 13:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1503 from weaveworks/1501-wrong-host

Browse Source 
Don't merge in container image metadata into containers anymore.
This commit is contained in:
Paul Bellamy
2016-05-13 11:42:59 +01:00
parent 2fac25d71a 4674d45c1a
commit 100915b268
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
render/container.go
View File

@@ -62,9 +62,8 @@ type containerWithImageNameRenderer struct {
Renderer
}
// Render produces a process graph where the minor labels contain the
// container name, if found. It also merges the image node metadata into the
// container metadata.
// Render produces a container graph where the the latest metadata contains the
// container image name, if found.
func (r containerWithImageNameRenderer) Render(rpt report.Report, dct Decorator) report.Nodes {
containers := r.Renderer.Render(rpt, dct)
images := SelectContainerImage.Render(rpt, dct)
@@ -81,7 +80,8 @@ func (r containerWithImageNameRenderer) Render(rpt report.Report, dct Decorator)
continue
}
output := c.Copy()
output.Latest = image.Latest.Merge(c.Latest)
output = propagateLatest(docker.ImageName, image, output)
output = propagateLatest(docker.ImageLabelPrefix+"works.weave.role", image, output)
outputs[id] = output
}
return outputs