From 95fff601cd0347956c9f48db9a8c25ad6982c981 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 25 Oct 2013 17:36:23 -0700 Subject: [PATCH] fix docker ps display Upstream-commit: d5c7e92a9a8ba65e1b2aad0f21393e8986d03d55 Component: engine --- components/engine/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index a4b9ee0464..ef265429ab 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -1170,7 +1170,7 @@ func (cli *DockerCli) CmdPs(args ...string) error { out.Names[i] = utils.Trunc(out.Names[i], 10) } } - fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s ago\t%s\t%s\t", out.ID, out.Image, out.Command, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports), strings.Join(out.Names, ",")) + fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\t%s\t%s\t", out.ID, out.Image, out.Command, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports), strings.Join(out.Names, ",")) if *size { if out.SizeRootFs > 0 { fmt.Fprintf(w, "%s (virtual %s)\n", utils.HumanSize(out.SizeRw), utils.HumanSize(out.SizeRootFs))