diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-12-09 14:13:53 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-12-11 06:07:14 -0500 |
| commit | 098e0a78856a1cc3b642300dc39f23b93e1f74a8 (patch) | |
| tree | 087f36309352fb39b890ce6d7ea6b6979ea8f6b4 /pkg/ps/ps.go | |
| parent | dd954781e6e308a0bbecfaf6699b41426100a58d (diff) | |
| download | podman-098e0a78856a1cc3b642300dc39f23b93e1f74a8.tar.gz podman-098e0a78856a1cc3b642300dc39f23b93e1f74a8.tar.bz2 podman-098e0a78856a1cc3b642300dc39f23b93e1f74a8.zip | |
Handle --rm when starting a container
podman start should follow the same behaviour as podman run when removing a
container.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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) |