diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-23 14:14:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 14:14:43 -0400 |
| commit | aa6881dd1474506610a85926f58893efe67eb98d (patch) | |
| tree | fad9ed257abcfc906ed103850a6ece49a9c5b53f | |
| parent | 92af85fcc2cb35b04ed74072ffd54d65b936d288 (diff) | |
| parent | 9ec0e10484ef9732ba1c4bbb2a9e3620286a5ff3 (diff) | |
| download | podman-aa6881dd1474506610a85926f58893efe67eb98d.tar.gz podman-aa6881dd1474506610a85926f58893efe67eb98d.tar.bz2 podman-aa6881dd1474506610a85926f58893efe67eb98d.zip | |
Merge pull request #6731 from baude/toolboxjson
Add JSON output field for ps
| -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 |