diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-14 18:01:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 18:01:18 +0200 |
| commit | a6caae0b5a40ae1ccf536e916624b4f81cdda7f4 (patch) | |
| tree | 0e07eeba9a90f914c01bf79113e670357377c2d2 /pkg/ps | |
| parent | 01c5915a52d6e5d23ad08fd1fcce38dba20f67db (diff) | |
| parent | 830f3a4462953b3698a21031db3964d0f0ae63b3 (diff) | |
| download | podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.tar.gz podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.tar.bz2 podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.zip | |
Merge pull request #5808 from baude/v2psformat2
v2podman ps revert structure changes
Diffstat (limited to 'pkg/ps')
| -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 9217fa595..58fcc2c21 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{ - 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(), + 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(), } if opts.Pod && len(conConfig.Pod) > 0 { pod, err := rt.GetPod(conConfig.Pod) |