summaryrefslogtreecommitdiff
path: root/cmd/podman/ps.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-01-17 15:11:41 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-18 18:32:10 +0000
commit05317d8f914f2ecf16852c8d4a571c4734a39290 (patch)
treee6a04babe0d544863c85a1333d83092182176b87 /cmd/podman/ps.go
parent1d7884b9a4f8c22bfcd2c4b76ce27de7ba949e79 (diff)
downloadpodman-05317d8f914f2ecf16852c8d4a571c4734a39290.tar.gz
podman-05317d8f914f2ecf16852c8d4a571c4734a39290.tar.bz2
podman-05317d8f914f2ecf16852c8d4a571c4734a39290.zip
Fix output for created containers
Created containers that haven't hit runc yet should still be considered created (not dead). Also, fixed loop for deleting containers as leftover code still exited there that prevented proper deletion of containers that could be deleted. Signed-off-by: baude <bbaude@redhat.com> Closes: #238 Approved by: rhatdan
Diffstat (limited to 'cmd/podman/ps.go')
-rw-r--r--cmd/podman/ps.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index c674c9d1e..944664c68 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -412,7 +412,7 @@ func getTemplateOutput(containers []*libpod.Container, opts psOptions) ([]psTemp
status = "Up " + runningFor + " ago"
case libpod.ContainerStatePaused:
status = "Paused"
- case libpod.ContainerStateCreated:
+ case libpod.ContainerStateCreated, libpod.ContainerStateConfigured:
status = "Created"
default:
status = "Dead"