Add support for rmi --force for nerdctl images

Signed-off-by: Manu Gupta <[email protected]>
containerd · Oct 22, 2024 · b16fed6 · b16fed6
1 parent beaa39d
commit b16fed6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/cmd/nerdctl/image/image_remove_test.go b/cmd/nerdctl/image/image_remove_test.go
@@ -351,3 +351,18 @@ func TestIssue3016(t *testing.T) {
 
 	testCase.Run(t)
 }
+
+func TestForceRemoveImage(t *testing.T) {
+	base := testutil.NewBase(t)
+	tID := testutil.Identifier(t)
+	base.Cmd("image", "prune", "--force", "--all").AssertOK()
+	base.Cmd("pull", testutil.CommonImage).AssertOK()
+	base.Cmd("run", "-d", "--name", tID+"-force", testutil.CommonImage, "sleep", "10s").AssertOK()
+	base.Cmd("rmi", "-f", testutil.CommonImage).AssertOK()
+	// Ensure that the image is deleted
+	base.Cmd("images").AssertOutNotContains(testutil.ImageRepo(testutil.CommonImage))
+	// Ensure that the container is still running
+	base.Cmd("ps", "-a").AssertOutContains(tID + "-force")
+	// Force remove to clean
+	base.Cmd("rm", "-f", tID+"-force").AssertOK()
+}
diff --git a/pkg/cmd/image/remove.go b/pkg/cmd/image/remove.go
@@ -77,8 +77,8 @@ func Remove(ctx context.Context, client *containerd.Client, args []string, optio
 				return nil
 			}
 
-			if cid, ok := runningImages[found.Image.Name]; ok {
-				return fmt.Errorf("conflict: unable to delete %s (cannot be forced) - image is being used by running container %s", found.Req, cid)
+			if cid, ok := runningImages[found.Image.Name]; !options.Force && ok {
+				return fmt.Errorf("conflict: unable to delete %s - image is being used by running container %s", found.Req, cid)
 			}
 			if cid, ok := usedImages[found.Image.Name]; ok && !options.Force {
 				return fmt.Errorf("conflict: unable to delete %s (must be forced) - image is being used by stopped container %s", found.Req, cid)