5 files changed, 33 insertions, 12 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 26e1bf00b..a15fdb553 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -104,8 +104,12 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filterMap, err := util.PrepareFilters(r)
+	if err != nil {
+		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
+		return
+	}
 
-	if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
+	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
 		return
 	}
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 6855742b2..606c52e41 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -106,7 +106,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		NamespaceOptions       string   `schema:"nsoptions"`
 		NoCache                bool     `schema:"nocache"`
 		OutputFormat           string   `schema:"outputformat"`
-		Platform               string   `schema:"platform"`
+		Platform               []string `schema:"platform"`
 		Pull                   bool     `schema:"pull"`
 		PullPolicy             string   `schema:"pullpolicy"`
 		Quiet                  bool     `schema:"q"`
@@ -126,7 +126,6 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		Registry:   "docker.io",
 		Rm:         true,
 		ShmSize:    64 * 1024 * 1024,
-		Tag:        []string{},
 	}
 
 	decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
@@ -481,16 +480,17 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	if len(query.Platform) > 0 {
-		variant := ""
-		buildOptions.OS, buildOptions.Architecture, variant, err = parse.Platform(query.Platform)
+	for _, platformSpec := range query.Platform {
+		os, arch, variant, err := parse.Platform(platformSpec)
 		if err != nil {
-			utils.BadRequest(w, "platform", query.Platform, err)
+			utils.BadRequest(w, "platform", platformSpec, err)
 			return
 		}
-		buildOptions.SystemContext.OSChoice = buildOptions.OS
-		buildOptions.SystemContext.ArchitectureChoice = buildOptions.Architecture
-		buildOptions.SystemContext.VariantChoice = variant
+		buildOptions.Platforms = append(buildOptions.Platforms, struct{ OS, Arch, Variant string }{
+			OS:      os,
+			Arch:    arch,
+			Variant: variant,
+		})
 	}
 	if _, found := r.URL.Query()["timestamp"]; found {
 		ts := time.Unix(query.Timestamp, 0)
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 4639093f2..343c0d0b3 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -73,8 +73,13 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filterMap, err := util.PrepareFilters(r)
+	if err != nil {
+		utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
+			errors.Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
+		return
+	}
 
-	if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
+	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
 			errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
 		return
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 72093c492..b4f08a746 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -156,8 +156,14 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filterMap, err := util.PrepareFilters(r)
+	if err != nil {
+		utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
+			errors.
+				Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
+		return
+	}
 
-	if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
+	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
 			errors.
 				Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 2630acac2..95981226c 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -1038,6 +1038,12 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
 	// description: Remove images that are not being used by a container
 	// parameters:
 	//  - in: query
+	//    name: all
+	//    default: false
+	//    type: boolean
+	//    description: |
+	//      Remove all images not in use by containers, not just dangling ones
+	//  - in: query
 	//    name: filters
 	//    type: string
 	//    description: |