aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/ps.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-03 06:06:14 -0700
committerGitHub <noreply@github.com>2018-10-03 06:06:14 -0700
commita3c4ce6717cab56d968fbe1fff0ced19f45c23cb (patch)
tree41657a47b6edeb8ab4776eddf64cb76f59b2813c /cmd/podman/ps.go
parentd5687946f6a0aa14a5326f26ca0ceca68588056f (diff)
parent978aac665060140f08a5574e3611a17cc98516c0 (diff)
downloadpodman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.gz
podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.bz2
podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.zip
Merge pull request #1531 from mheon/add_exited_state
Add ContainerStateExited and OCI delete() in cleanup()
Diffstat (limited to 'cmd/podman/ps.go')
-rw-r--r--cmd/podman/ps.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index d36c929e8..e53afe1bf 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -548,6 +548,8 @@ func getTemplateOutput(psParams []psJSONParams, opts shared.PsOptions) ([]psTemp
labels := formatLabels(psParam.Labels)
switch psParam.Status {
+ case libpod.ContainerStateExited.String():
+ fallthrough
case libpod.ContainerStateStopped.String():
exitedSince := units.HumanDuration(time.Since(psParam.ExitedAt))
status = fmt.Sprintf("Exited (%d) %s ago", psParam.ExitCode, exitedSince)