diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-24 09:53:08 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-10-02 12:05:22 -0400 |
| commit | 29dbab64407d11f314b894c37deb4419faeefc56 (patch) | |
| tree | 5e377ce2d4ec78fba466887bbe8e0dfd97c08312 | |
| parent | 2c7f97d5a782d35efc195baf7a7ca9016ca05409 (diff) | |
| download | podman-29dbab64407d11f314b894c37deb4419faeefc56.tar.gz podman-29dbab64407d11f314b894c37deb4419faeefc56.tar.bz2 podman-29dbab64407d11f314b894c37deb4419faeefc56.zip | |
Address review comments and fix ps output
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| -rw-r--r-- | cmd/podman/ps.go | 2 | ||||
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
2 files changed, 5 insertions, 3 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) diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index b8a8b6c20..0fe896e5f 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -332,9 +332,9 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool) label.ReleaseLabel(c.ProcessLabel()) r.reserveLabels() } - // Delete the container - // Only do this if we're not ContainerStateConfigured - if we are, - // we haven't been created in the runtime yet + // Delete the container. + // Not needed in Configured and Exited states, where the container + // doesn't exist in the runtime if c.state.State != ContainerStateConfigured && c.state.State != ContainerStateExited { if err := c.delete(ctx); err != nil { |