opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-05 19:02:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle --rm when starting a container

Browse Source 
podman start should follow the same behaviour as podman run when removing a
container.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-12-09 14:13:53 -05:00
parent dd954781e6
commit 098e0a7885
6 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/ps/ps.go
View File

@ -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)