From 37d7fd66b4f4a413f40d4fa9a12041baeb46021d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sun, 20 Jan 2013 00:46:46 -0800 Subject: [PATCH] 'docker list' shows which processes are running (always false for now) Upstream-commit: 95c6443c4329d82b7abec0f9689aad92dafa0bc3 Component: engine --- components/engine/dockerd/dockerd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/dockerd/dockerd.go b/components/engine/dockerd/dockerd.go index 0892e32298..5e12c1d3f6 100644 --- a/components/engine/dockerd/dockerd.go +++ b/components/engine/dockerd/dockerd.go @@ -244,7 +244,7 @@ func (docker *Docker) CmdList(stdin io.ReadCloser, stdout io.Writer, args ...str longestCol = 8 } tpl := "%-16s %-*.*s %-6s %-25s %10s %-s\n" - fmt.Fprintf(stdout, tpl, "ID", longestCol, longestCol, "CMD", "STATUS", "CREATED", "CHANGES", "LAYERS") + fmt.Fprintf(stdout, tpl, "ID", longestCol, longestCol, "CMD", "RUNNING", "CREATED", "CHANGES", "LAYERS") for _, container := range docker.containers { var layers []string for _, layer := range container.Layers { @@ -257,7 +257,7 @@ func (docker *Docker) CmdList(stdin io.ReadCloser, stdout io.Writer, args ...str fmt.Fprintf(stdout, tpl, /* ID */ container.Id, /* CMD */ longestCol, longestCol, container.CmdString(), - /* STATUS */ "?", + /* RUNNING */ fmt.Sprintf("%v", container.Running), /* CREATED */ humanDuration(time.Now().Sub(container.Created)) + " ago", /* CHANGES */ fmt.Sprintf("%.1fM", float32(container.BytesChanged) / 1024 / 1024), /* LAYERS */ strings.Join(layers, ", "))