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

Merge pull request #12626 from vrothberg/may-the-force-be-with-removal

Browse Source 
image rm: allow for force-remove infra images
This commit is contained in:
Daniel J Walsh
2021-12-19 06:18:21 -05:00
committed by GitHub
parent 65efd55d41 12d762f8ee
commit f45070ee0e
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libpod/runtime_img.go
View File

@ -36,10 +36,21 @@ func (r *Runtime) RemoveContainersForImageCallback(ctx context.Context) libimage
return err
}
for _, ctr := range ctrs {
if ctr.config.RootfsImageID == imageID {
var timeout *uint
if ctr.config.RootfsImageID != imageID {
continue
}
var timeout *uint
if ctr.config.IsInfra {
pod, err := r.state.Pod(ctr.config.Pod)
if err != nil {
return errors.Wrapf(err, "container %s is in pod %s, but pod cannot be retrieved", ctr.ID(), pod.ID())
}
if err := r.removePod(ctx, pod, true, true, timeout); err != nil {
return errors.Wrapf(err, "removing image %s: container %s using image could not be removed", imageID, ctr.ID())
}
} else {
if err := r.removeContainer(ctx, ctr, true, false, false, timeout); err != nil {
return errors.Wrapf(err, "error removing image %s: container %s using image could not be removed", imageID, ctr.ID())
return errors.Wrapf(err, "removing image %s: container %s using image could not be removed", imageID, ctr.ID())
}
}
}

60
test/system/010-images.bats
View File

@ -240,4 +240,64 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
run_podman rmi test:1.0
}
@test "podman images - rmi -af removes all containers and pods" {
pname=$(random_string)
run_podman create --pod new:$pname $IMAGE
run_podman inspect --format '{{.ID}}' $IMAGE
imageID=$output
run_podman version --format "{{.Server.Version}}-{{.Server.Built}}"
pauseImage=localhost/podman-pause:$output
run_podman inspect --format '{{.ID}}' $pauseImage
pauseID=$output
run_podman 2 rmi -a
is "$output" "Error: 2 errors occurred:
.** Image used by .*: image is in use by a container
.** Image used by .*: image is in use by a container"
run_podman rmi -af
is "$output" "Untagged: $IMAGE
Untagged: $pauseImage
Deleted: $imageID
Deleted: $pauseID" "infra images gets removed as well"
run_podman images --noheading
is "$output" ""
run_podman ps --all --noheading
is "$output" ""
run_podman pod ps --noheading
is "$output" ""
run_podman create --pod new:$pname $IMAGE
}
@test "podman images - rmi -f can remove infra images" {
pname=$(random_string)
run_podman create --pod new:$pname $IMAGE
run_podman version --format "{{.Server.Version}}-{{.Server.Built}}"
pauseImage=localhost/podman-pause:$output
run_podman inspect --format '{{.ID}}' $pauseImage
pauseID=$output
run_podman 2 rmi $pauseImage
is "$output" "Error: Image used by .* image is in use by a container"
run_podman rmi -f $pauseImage
is "$output" "Untagged: $pauseImage
Deleted: $pauseID"
# Force-removing the infra container removes the pod and all its containers.
run_podman ps --all --noheading
is "$output" ""
run_podman pod ps --noheading
is "$output" ""
# Other images are still present.
run_podman image exists $IMAGE
}
# vim: filetype=sh