summaryrefslogtreecommitdiff
path: root/pkg/api/handlers
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-15 06:21:58 -0400
committerGitHub <noreply@github.com>2021-09-15 06:21:58 -0400
commitaff64dda65514064ccbf7fcaf78293e111539eb6 (patch)
tree395ab38c3a486f0dd43fa157c8b2899782053d26 /pkg/api/handlers
parent07e9bf340a83ecb7174e32fb565826c21a9a91ca (diff)
parent5dbf3ee7aeef6e2aca5512b3ad8684610080d421 (diff)
downloadpodman-aff64dda65514064ccbf7fcaf78293e111539eb6.tar.gz
podman-aff64dda65514064ccbf7fcaf78293e111539eb6.tar.bz2
podman-aff64dda65514064ccbf7fcaf78293e111539eb6.zip
Merge pull request #11574 from nalind/buildah-platforms
build: take advantage of --platform lists
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r--pkg/api/handlers/compat/images_build.go18
1 files changed, 9 insertions, 9 deletions
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)