diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-09 15:56:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 15:56:26 +0200 |
| commit | 1662310e516cb3c21842f59b8f607bb0af408ec5 (patch) | |
| tree | 884889920008afc6f688e4f3d5ceec7f9025139b /pkg/ps/ps.go | |
| parent | 555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39 (diff) | |
| parent | 8ce23775a62b816c599e6d65c92985f62acc85c5 (diff) | |
| download | podman-1662310e516cb3c21842f59b8f607bb0af408ec5.tar.gz podman-1662310e516cb3c21842f59b8f607bb0af408ec5.tar.bz2 podman-1662310e516cb3c21842f59b8f607bb0af408ec5.zip | |
Merge pull request #5754 from baude/v2psformat
v2podman ps alter formats
Diffstat (limited to 'pkg/ps/ps.go')
| -rw-r--r-- | pkg/ps/ps.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 58fcc2c21..9217fa595 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -148,23 +148,23 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities } ps := entities.ListContainer{ - Command: conConfig.Command, - Created: conConfig.CreatedTime.Unix(), - Exited: exited, - ExitCode: exitCode, - ExitedAt: exitedTime.Unix(), - ID: conConfig.ID, - Image: conConfig.RootfsImageName, - IsInfra: conConfig.IsInfra, - Labels: conConfig.Labels, - Mounts: ctr.UserVolumes(), - Names: []string{conConfig.Name}, - Pid: pid, - Pod: conConfig.Pod, - Ports: conConfig.PortMappings, - Size: size, - StartedAt: startedTime.Unix(), - State: conState.String(), + Cmd: conConfig.Command, + Created: conConfig.CreatedTime.Unix(), + Exited: exited, + ExitCode: exitCode, + ExitedAt: exitedTime.Unix(), + ID: conConfig.ID, + Image: conConfig.RootfsImageName, + IsInfra: conConfig.IsInfra, + Labels: conConfig.Labels, + Mounts: ctr.UserVolumes(), + ContainerNames: []string{conConfig.Name}, + Pid: pid, + Pod: conConfig.Pod, + PortMappings: conConfig.PortMappings, + ContainerSize: size, + StartedAt: startedTime.Unix(), + ContainerState: conState.String(), } if opts.Pod && len(conConfig.Pod) > 0 { pod, err := rt.GetPod(conConfig.Pod) |