opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 00:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6731 from baude/toolboxjson

Browse Source 
Add JSON output field for ps
This commit is contained in:
OpenShift Merge Robot
2020-06-23 14:14:43 -04:00
committed by GitHub
parent 92af85fcc2 9ec0e10484
commit aa6881dd14
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/containers/ps.go
View File

@ -110,7 +110,12 @@ func checkFlags(c *cobra.Command) error {
} }
func jsonOut(responses []entities.ListContainer) 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 { if err != nil {
return err return err
} }

2
pkg/domain/entities/container_ps.go
View File

@ -15,6 +15,8 @@ type ListContainer struct {
Command []string Command []string
// Container creation time // Container creation time
Created int64 Created int64
// Human readable container creation time.
CreatedAt string
// If container has exited/stopped // If container has exited/stopped
Exited bool Exited bool
// Time container exited // Time container exited