Merge pull request #7155 from mheon/fix_rmi_force

Ensure that 'rmi --force' evicts Podman containers
This commit is contained in:
OpenShift Merge Robot
2020-07-30 14:52:59 -04:00
committed by GitHub

View File

@ -51,7 +51,7 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
imageCtrs = append(imageCtrs, ctr)
}
}
if len(imageCtrs) > 0 && len(img.Names()) <= 1 {
if len(imageCtrs) > 0 && (len(img.Names()) <= 1 || (force && img.InputIsID())) {
if force {
for _, ctr := range imageCtrs {
if err := r.removeContainer(ctx, ctr, true, false, false); err != nil {