Merge pull request #5632 from jwhonce/wip/images

V2 podman image prune

3 files changed, 20 insertions, 10 deletions

diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 4a51b3de4..20af0356f 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -119,7 +119,7 @@ type ImageInspectOptions struct {
 
 type ImageListOptions struct {
 	All     bool       `json:"all" schema:"all"`
-	Filter  []string   `json:",omitempty"`
+	Filter  []string   `json:"Filter,omitempty"`
 	Filters url.Values `json:"filters" schema:"filters"`
 }
 
@@ -128,8 +128,9 @@ type ImageListOptions struct {
 // }
 
 type ImagePruneOptions struct {
-	All    bool
-	Filter ImageFilter
+	All     bool       `json:"all" schema:"all"`
+	Filter  []string   `json:"filter" schema:"filter"`
+	Filters url.Values `json:"filters" schema:"filters"`
 }
 
 type ImagePruneReport struct {
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index e3b3e310b..44420c1e1 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -88,13 +88,18 @@ func (ir *ImageEngine) deleteImage(ctx context.Context, img *libpodImage.Image,
 }
 
 func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
-	results, err := ir.Libpod.ImageRuntime().PruneImages(ctx, opts.All, []string{})
+	results, err := ir.Libpod.ImageRuntime().PruneImages(ctx, opts.All, opts.Filter)
 	if err != nil {
 		return nil, err
 	}
 
-	report := entities.ImagePruneReport{}
-	copy(report.Report.Id, results)
+	report := entities.ImagePruneReport{
+		Report: entities.Report{
+			Id:  results,
+			Err: nil,
+		},
+		Size: 0,
+	}
 	return &report, nil
 }
 
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 6a241641e..6a3adc9ee 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -2,7 +2,6 @@ package tunnel
 
 import (
 	"context"
-	"net/url"
 
 	images "github.com/containers/libpod/pkg/bindings/images"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -72,12 +71,17 @@ func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entiti
 }
 
 func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
-	results, err := images.Prune(ir.ClientCxt, url.Values{})
+	results, err := images.Prune(ir.ClientCxt, &opts.All, opts.Filters)
 	if err != nil {
 		return nil, err
 	}
 
-	report := entities.ImagePruneReport{}
-	copy(report.Report.Id, results)
+	report := entities.ImagePruneReport{
+		Report: entities.Report{
+			Id:  results,
+			Err: nil,
+		},
+		Size: 0,
+	}
 	return &report, nil
 }