Merge pull request #4743 from baude/imageresponse

add struct response for removal of images

2 files changed, 19 insertions, 2 deletions

diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go
index 3f621116e..f4ca88ea8 100644
--- a/cmd/podman/rmi.go
+++ b/cmd/podman/rmi.go
@@ -68,7 +68,7 @@ func rmiCmd(c *cliconfig.RmiValues) error {
 	images := args[:]
 
 	removeImage := func(img *adapter.ContainerImage) {
-		msg, err := runtime.RemoveImage(ctx, img, c.Force)
+		response, err := runtime.RemoveImage(ctx, img, c.Force)
 		if err != nil {
 			if errors.Cause(err) == storage.ErrImageUsedByContainer {
 				fmt.Printf("A container associated with containers/storage, i.e. via Buildah, CRI-O, etc., may be associated with this image: %-12.12s\n", img.ID())
@@ -83,7 +83,14 @@ func rmiCmd(c *cliconfig.RmiValues) error {
 			lastError = err
 			return
 		}
-		fmt.Println(msg)
+		// Iterate if any images tags were deleted
+		for _, i := range response.Untagged {
+			fmt.Printf("Untagged: %s\n", i)
+		}
+		// Make sure an image was deleted (and not just untagged); else print it
+		if len(response.Deleted) > 0 {
+			fmt.Printf("Deleted: %s\n", response.Deleted)
+		}
 	}
 
 	if removeAll {
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 2251050c3..1bacd2de6 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -18,6 +18,11 @@ type StringResponse (
     message: string
 )
 
+type RemoveImageResponse (
+    untagged: []string,
+    deleted: string
+)
+
 type LogLine (
     device: string,
     parseLogType : string,
@@ -867,6 +872,11 @@ method TagImage(name: string, tagged: string) -> (image: string)
 # ~~~
 method RemoveImage(name: string, force: bool) -> (image: string)
 
+# RemoveImageWithResponse takes the name or ID of an image as well as a boolean that determines if containers using that image
+# should be deleted.  If the image cannot be found, an [ImageNotFound](#ImageNotFound) error will be returned. The reponse is
+# in the form of a RemoveImageResponse .
+method RemoveImageWithResponse(name: string, force: bool) -> (response: RemoveImageResponse)
+
 # SearchImages searches available registries for images that contain the
 # contents of "query" in their name. If "limit" is given, limits the amount of
 # search results per registry.