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

Merge pull request #7557 from vrothberg/fix-7384

Browse Source 
podman stop: do not cleanup for auto-removal
This commit is contained in:
OpenShift Merge Robot
2020-09-08 10:18:01 -04:00
committed by GitHub
parent be7778df6c d3e05de156
commit f763962024
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/domain/infra/abi/containers.go
View File

@ -174,6 +174,12 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
return err return err
} }
} }
if c.AutoRemove() {
// Issue #7384: if the container is configured for
// auto-removal, it might already have been removed at
// this point.
return nil
}
return c.Cleanup(ctx) return c.Cleanup(ctx)
}) })
if err != nil { if err != nil {