summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Cui <acui@redhat.com>2020-07-30 13:50:50 -0400
committerAshley Cui <acui@redhat.com>2020-07-30 15:33:22 -0400
commit8e6a6197db6496b9ef98399be49dfda8fb14811a (patch)
tree8c4d6830c15293eb015511394c27cd44828bd6ed
parent4132b71478c486b3f4eff6a344ee1b2defbab86f (diff)
downloadpodman-8e6a6197db6496b9ef98399be49dfda8fb14811a.tar.gz
podman-8e6a6197db6496b9ef98399be49dfda8fb14811a.tar.bz2
podman-8e6a6197db6496b9ef98399be49dfda8fb14811a.zip
add {{.RunningFor}} placeholder in ps --format
For docker compatibility Signed-off-by: Ashley Cui <acui@redhat.com>
-rw-r--r--cmd/podman/containers/ps.go4
-rw-r--r--test/e2e/ps_test.go8
2 files changed, 12 insertions, 0 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 34fa4fab5..64271031d 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -307,6 +307,10 @@ func (l psReporter) Status() string {
return l.State()
}
+func (l psReporter) RunningFor() string {
+ return l.CreatedHuman()
+}
+
// Command returns the container command in string format
func (l psReporter) Command() string {
command := strings.Join(l.ListContainer.Command, " ")
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 281968fcd..f10ef5c99 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -476,5 +476,13 @@ var _ = Describe("Podman ps", func() {
session.WaitWithDefaultTimeout()
Expect(session.OutputToString()).To(ContainSubstring("echo very long cr..."))
})
+ It("podman ps --format {{RunningFor}}", func() {
+ _, ec, _ := podmanTest.RunLsContainer("")
+ Expect(ec).To(Equal(0))
+ result := podmanTest.Podman([]string{"ps", "-a", "--format", "{{.RunningFor}}"})
+ result.WaitWithDefaultTimeout()
+ Expect(result.ExitCode()).To(Equal(0))
+ Expect(result.OutputToString()).To(ContainSubstring("ago"))
+ })
})