Merge pull request #6731 from baude/toolboxjson

Add JSON output field for ps

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
 	}

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