From 239f4bad11fe9a25fd038f0ab2cd532feb6dec8c Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Tue, 22 Jul 2014 16:08:01 -0700 Subject: [PATCH] Added parent prefix to all Docker containers. --- container/docker/handler.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index f2f383b4..065b19da 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -21,6 +21,7 @@ import ( "math" "os" "path" + "path/filepath" "strings" "github.com/docker/libcontainer" @@ -215,16 +216,22 @@ func (self *dockerContainerHandler) ListContainers(listType container.ListType) if err != nil { return nil, err } + + // On non-systemd systems Docker containers are under /docker. + containerPrefix := "/docker" + if self.useSystemd { + containerPrefix = "/system.slice" + } + ret := make([]info.ContainerReference, 0, len(containers)+1) for _, c := range containers { if !strings.HasPrefix(c.Status, "Up ") { continue } - path := fmt.Sprintf("/docker/%v", c.ID) - aliases := c.Names + ref := info.ContainerReference{ - Name: path, - Aliases: aliases, + Name: filepath.Join(containerPrefix, c.ID), + Aliases: c.Names, } ret = append(ret, ref) }