summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-27 20:25:14 +0200
committerGitHub <noreply@github.com>2020-04-27 20:25:14 +0200
commit5554698a4463a6d2543d3427d6e5e3d1ba3804fe (patch)
tree3e3f67196bbc5879dce1bb73f14c1faeb68a65f3 /cmd
parentca1c674d2e027b563c3e9fd92c335eb3f5e5e05d (diff)
parentdf9450925b2335790108860e7dba389e24fa5f7d (diff)
downloadpodman-5554698a4463a6d2543d3427d6e5e3d1ba3804fe.tar.gz
podman-5554698a4463a6d2543d3427d6e5e3d1ba3804fe.tar.bz2
podman-5554698a4463a6d2543d3427d6e5e3d1ba3804fe.zip
Merge pull request #5975 from giuseppe/fix-pause-tests
[v2] tests: fix pause tests
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers/ps.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 49e77abd2..a006e918d 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -223,7 +223,7 @@ func createPsOut() (string, string) {
}
headers := defaultHeaders
row += "{{.ID}}"
- row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.State}}\t{{.Ports}}\t{{.Names}}"
+ row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
if listOpts.Pod {
headers += "\tPOD ID\tPODNAME"
@@ -282,6 +282,11 @@ func (l psReporter) State() string {
return state
}
+// Status is a synonym for State()
+func (l psReporter) Status() string {
+ return l.State()
+}
+
// Command returns the container command in string format
func (l psReporter) Command() string {
return strings.Join(l.ListContainer.Command, " ")