diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-11 21:54:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 21:54:55 -0500 |
| commit | fbcd44567c70e1da78a25f077bbc7cae3dd88081 (patch) | |
| tree | 18508b20699ab422f4ae7dd6cedcac5667ac45bc /pkg/ps/ps.go | |
| parent | b0a287ce46ee8326d25efc1e3b9d690eb1e1bbab (diff) | |
| parent | 098e0a78856a1cc3b642300dc39f23b93e1f74a8 (diff) | |
| download | podman-fbcd44567c70e1da78a25f077bbc7cae3dd88081.tar.gz podman-fbcd44567c70e1da78a25f077bbc7cae3dd88081.tar.bz2 podman-fbcd44567c70e1da78a25f077bbc7cae3dd88081.zip | |
Merge pull request #8688 from rhatdan/start
Handle --rm when starting a container
Diffstat (limited to 'pkg/ps/ps.go')
| -rw-r--r-- | pkg/ps/ps.go | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index cfdf3ee49..6c26e8708 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -179,24 +179,25 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities } ps := entities.ListContainer{ - Command: conConfig.Command, - Created: conConfig.CreatedTime, - Exited: exited, - ExitCode: exitCode, - ExitedAt: exitedTime.Unix(), - ID: conConfig.ID, - Image: conConfig.RootfsImageName, - ImageID: conConfig.RootfsImageID, - IsInfra: conConfig.IsInfra, - Labels: conConfig.Labels, - Mounts: ctr.UserVolumes(), - Names: []string{conConfig.Name}, - Pid: pid, - Pod: conConfig.Pod, - Ports: portMappings, - Size: size, - StartedAt: startedTime.Unix(), - State: conState.String(), + AutoRemove: ctr.AutoRemove(), + Command: conConfig.Command, + Created: conConfig.CreatedTime, + Exited: exited, + ExitCode: exitCode, + ExitedAt: exitedTime.Unix(), + ID: conConfig.ID, + Image: conConfig.RootfsImageName, + ImageID: conConfig.RootfsImageID, + IsInfra: conConfig.IsInfra, + Labels: conConfig.Labels, + Mounts: ctr.UserVolumes(), + Names: []string{conConfig.Name}, + Pid: pid, + Pod: conConfig.Pod, + Ports: portMappings, + Size: size, + StartedAt: startedTime.Unix(), + State: conState.String(), } if opts.Pod && len(conConfig.Pod) > 0 { podName, err := rt.GetName(conConfig.Pod) |