manifest: rm should remove only manifests not referenced images.

Following commit makes sure that `buildah manifest rm <list>` only removes the manifest list not referenced images. Signed-off-by: Aditya Rajan <[email protected]>
containers · Sep 2, 2021 · c84c568 · c84c568
1 parent 36b74ad
commit c84c568
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/cmd/buildah/manifest.go b/cmd/buildah/manifest.go
@@ -459,7 +459,8 @@ func manifestRmCmd(c *cobra.Command, args []string) error {
 	}
 
 	options := &libimage.RemoveImagesOptions{
-		Filters: []string{"readonly=false"},
+		Filters:        []string{"readonly=false"},
+		LookupManifest: true,
 	}
 	rmiReports, rmiErrors := runtime.RemoveImages(context.Background(), args, options)
 	for _, r := range rmiReports {

diff --git a/tests/rm.bats b/tests/rm.bats
@@ -52,3 +52,17 @@ load helpers
   run_buildah 125 rm -a "$cid"
   expect_output --substring "when using the --all switch, you may not pass any containers names or IDs"
 }
+
+@test "remove a single tagged manifest list" {
+  _prefetch busybox
+  run_buildah manifest create manifestsample
+  run_buildah manifest add manifestsample busybox
+  run_buildah tag manifestsample manifestsample2
+  run_buildah manifest rm manifestsample2
+  # Output should only untag the listed manifest nothing else
+  expect_output "untagged: localhost/manifestsample2:latest"
+  run_buildah manifest rm manifestsample
+  # Since actual list is getting removed it will also print the image id of list
+  # So check for substring instead of exact match
+  expect_output --substring "untagged: localhost/manifestsample:latest"
+}