diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-07 10:03:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 10:03:43 -0400 |
| commit | f44645aad6822aee27c241f2f0f43bdbc652dc0a (patch) | |
| tree | dc9e06d86e4fefcea8a8d3d653b9ec9a74b0232c /pkg/api | |
| parent | 0e67053b9a26f20e5ccbffdcc5e7a84254ca16b8 (diff) | |
| parent | 48b4b665b1c0c3ebab8007e0c39bb3aab6f3c414 (diff) | |
| download | podman-f44645aad6822aee27c241f2f0f43bdbc652dc0a.tar.gz podman-f44645aad6822aee27c241f2f0f43bdbc652dc0a.tar.bz2 podman-f44645aad6822aee27c241f2f0f43bdbc652dc0a.zip | |
Merge pull request #9962 from edsantiago/podman_remote_arch
Handle podman-remote --arch, --platform, --os
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index ab92434b1..700881926 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -15,6 +15,7 @@ import ( "github.com/containers/buildah" buildahDefine "github.com/containers/buildah/define" + "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/util" "github.com/containers/image/v5/types" "github.com/containers/podman/v3/libpod" @@ -445,6 +446,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) + if err != nil { + utils.BadRequest(w, "platform", query.Platform, err) + return + } + buildOptions.SystemContext.OSChoice = buildOptions.OS + buildOptions.SystemContext.ArchitectureChoice = buildOptions.Architecture + buildOptions.SystemContext.VariantChoice = variant + } if _, found := r.URL.Query()["timestamp"]; found { ts := time.Unix(query.Timestamp, 0) buildOptions.Timestamp = &ts |