diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-06-23 11:19:33 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-06-24 14:41:24 -0400 |
| commit | 9a4517b3706847d45c575839200f2d8f536c7738 (patch) | |
| tree | 368b8cb074ca8a55c777a6a3374e762aabe803f3 | |
| parent | 61bd645732225ebe563ad8628a2279b5e226a278 (diff) | |
| download | podman-9a4517b3706847d45c575839200f2d8f536c7738.tar.gz podman-9a4517b3706847d45c575839200f2d8f536c7738.tar.bz2 podman-9a4517b3706847d45c575839200f2d8f536c7738.zip | |
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>
| -rw-r--r-- | cmd/podman/containers/ps.go | 7 | ||||
| -rw-r--r-- | pkg/domain/entities/container_ps.go | 2 |
2 files changed, 8 insertions, 1 deletions
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 |