Merge pull request #5615 from jwhonce/wip/images

V2 podman image rm | podman rmi [IMAGE]

1 files changed, 18 insertions, 15 deletions

diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 60df40498..6a241641e 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -9,27 +9,30 @@ import (
 	"github.com/containers/libpod/pkg/domain/utils"
 )
 
-func (ir *ImageEngine) Delete(ctx context.Context, nameOrId string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
-	results, err := images.Remove(ir.ClientCxt, nameOrId, &opts.Force)
-	if err != nil {
-		return nil, err
-	}
+func (ir *ImageEngine) Exists(_ context.Context, nameOrId string) (*entities.BoolReport, error) {
+	found, err := images.Exists(ir.ClientCxt, nameOrId)
+	return &entities.BoolReport{Value: found}, err
+}
 
-	report := entities.ImageDeleteReport{
-		Untagged: nil,
-		Deleted:  "",
-	}
+func (ir *ImageEngine) Delete(ctx context.Context, nameOrId []string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
+	report := entities.ImageDeleteReport{}
 
-	for _, e := range results {
-		if a, ok := e["Deleted"]; ok {
-			report.Deleted = a
+	for _, id := range nameOrId {
+		results, err := images.Remove(ir.ClientCxt, id, &opts.Force)
+		if err != nil {
+			return nil, err
 		}
+		for _, e := range results {
+			if a, ok := e["Deleted"]; ok {
+				report.Deleted = append(report.Deleted, a)
+			}
 
-		if a, ok := e["Untagged"]; ok {
-			report.Untagged = append(report.Untagged, a)
+			if a, ok := e["Untagged"]; ok {
+				report.Untagged = append(report.Untagged, a)
+			}
 		}
 	}
-	return &report, err
+	return &report, nil
 }
 
 func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {