From 15417b6b0275407aa45639f8b1117b874387a36f Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 2 Sep 2015 15:34:34 +0000 Subject: [PATCH] Show container image details for containers. --- render/mapping.go | 4 ++-- report/id.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/render/mapping.go b/render/mapping.go index 1c7e50ff5..fd8d33740 100644 --- a/render/mapping.go +++ b/render/mapping.go @@ -131,8 +131,8 @@ func MapContainerIdentity(m RenderableNode, _ report.Networks) RenderableNodes { node := NewRenderableNodeWith(id, major, minor, rank, m) if imageID, ok := m.Metadata[docker.ImageID]; ok { - scope, _, _ := report.ParseContainerNodeID(m.ID) - node.Origins = node.Origins.Add(report.MakeContainerNodeID(scope, imageID)) + hostID, _, _ := report.ParseContainerNodeID(m.ID) + node.Origins = node.Origins.Add(report.MakeContainerNodeID(hostID, imageID)) } return RenderableNodes{id: node} } diff --git a/report/id.go b/report/id.go index 19501ce04..71c69574c 100644 --- a/report/id.go +++ b/report/id.go @@ -121,10 +121,10 @@ func ParseEndpointNodeID(endpointNodeID string) (hostID, address, port string, o return fields[0], fields[1], fields[2], true } -// ParseContainerNodeID produces the host ID, and container id from an container +// ParseContainerNodeID produces the host and container id from an container // node ID. func ParseContainerNodeID(containerNodeID string) (hostID, containerID string, ok bool) { - fields := strings.SplitN(containerNodeID, ScopeDelim, 3) + fields := strings.SplitN(containerNodeID, ScopeDelim, 2) if len(fields) != 2 { return "", "", false }