summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2021-12-22 09:35:00 -0500
committerMatthew Heon <mheon@redhat.com>2022-01-17 13:56:07 -0500
commit141de86862898a4b9e35c15f51031952c63c7114 (patch)
treec5ad04e0c9ec12d98d09ecfc51b54e6b4b30f494 /cmd
parent8514ebd1827b12bae8b5d53d8f0e36244d1b3c3a (diff)
downloadpodman-141de86862898a4b9e35c15f51031952c63c7114.tar.gz
podman-141de86862898a4b9e35c15f51031952c63c7114.tar.bz2
podman-141de86862898a4b9e35c15f51031952c63c7114.zip
Revamp Libpod state strings for Docker compat
Improve our compatibility with Docker by better handling the state strings that we print in `podman ps`. Docker capitalizes all states in `ps` (we do not) - fix this in our PS code. Also, stop normalizing ContainerStateConfigured to the "Created" state, and instead make it always be Created, with the existing Created state becoming Initialized. I didn't rename the actual states because I'm somewhat reticent to make such a large change a day before we leave for break. It's somewhat confusing that ContainerStateConfigured now returns Created, but internally and externally we're still consistent. [NO NEW TESTS NEEDED] existing tests should catch anything that broke. I also consider this a breaking change. I will flag appropriately on Github. Fixes RHBZ#2010432 and RHBZ#2032561 Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers/ps.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index c8a03ab4f..f6ba3c1f3 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -358,13 +358,12 @@ func (l psReporter) State() string {
case "running":
t := units.HumanDuration(time.Since(time.Unix(l.StartedAt, 0)))
state = "Up " + t + " ago"
- case "configured":
- state = "Created"
case "exited", "stopped":
t := units.HumanDuration(time.Since(time.Unix(l.ExitedAt, 0)))
state = fmt.Sprintf("Exited (%d) %s ago", l.ExitCode, t)
default:
- state = l.ListContainer.State
+ // Need to capitalize the first letter to match Docker.
+ state = strings.Title(l.ListContainer.State)
}
return state
}