Merge pull request #5632 from jwhonce/wip/images

V2 podman image prune

2 files changed, 6 insertions, 4 deletions

diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index cce718f54..354a13bf5 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -64,6 +64,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 
 	query := struct {
+		All     bool
 		Filters map[string][]string `schema:"filters"`
 	}{
 		// This is where you can override the golang default value for one of fields
@@ -80,7 +81,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 			filters = append(filters, fmt.Sprintf("%s=%s", k, val))
 		}
 	}
-	pruneCids, err := runtime.ImageRuntime().PruneImages(r.Context(), false, filters)
+	pruneCids, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, filters)
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index f8e666451..ee85c1a41 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -119,12 +119,12 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
 
 func PruneImages(w http.ResponseWriter, r *http.Request) {
 	var (
-		all bool
 		err error
 	)
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	query := struct {
+		All     bool                `schema:"all"`
 		Filters map[string][]string `schema:"filters"`
 	}{
 		// override any golang type defaults
@@ -140,7 +140,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 	if _, found := r.URL.Query()["filters"]; found {
 		dangling := query.Filters["all"]
 		if len(dangling) > 0 {
-			all, err = strconv.ParseBool(query.Filters["all"][0])
+			query.All, err = strconv.ParseBool(query.Filters["all"][0])
 			if err != nil {
 				utils.InternalServerError(w, err)
 				return
@@ -152,7 +152,8 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 			libpodFilters = append(libpodFilters, fmt.Sprintf("%s=%s", k, v[0]))
 		}
 	}
-	cids, err := runtime.ImageRuntime().PruneImages(r.Context(), all, libpodFilters)
+
+	cids, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, libpodFilters)
 	if err != nil {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err)
 		return