From 9ec0e10484ef9732ba1c4bbb2a9e3620286a5ff3 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Tue, 23 Jun 2020 11:19:33 -0500
Subject: Add JSON output field for ps
the toolbox team needs a field in our ps json that represents a human readable time.
Signed-off-by: Brent Baude <bbaude@redhat.com>
---
cmd/podman/containers/ps.go | 7 ++++++-
pkg/domain/entities/container_ps.go | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index ffd2054a6..5d3c9263e 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -110,7 +110,12 @@ func checkFlags(c *cobra.Command) error {
}
func jsonOut(responses []entities.ListContainer) error {
- b, err := json.MarshalIndent(responses, "", " ")
+ r := make([]entities.ListContainer, 0)
+ for _, con := range responses {
+ con.CreatedAt = units.HumanDuration(time.Since(time.Unix(con.Created, 0))) + " ago"
+ r = append(r, con)
+ }
+ b, err := json.MarshalIndent(r, "", " ")
if err != nil {
return err
}
diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go
index c5e11f188..05627c4b3 100644
--- a/pkg/domain/entities/container_ps.go
+++ b/pkg/domain/entities/container_ps.go
@@ -15,6 +15,8 @@ type ListContainer struct {
Command []string
// Container creation time
Created int64
+ // Human readable container creation time.
+ CreatedAt string
// If container has exited/stopped
Exited bool
// Time container exited
--
cgit v1.2.3-54-g00ecf