diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-29 20:58:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 20:58:51 +0100 |
| commit | e7540d0406c49b22de245246d16ebc6e1778df37 (patch) | |
| tree | d25a5f8d259d19f2c0017d9987e93d065e577f89 /cmd/podman/build.go | |
| parent | 5918f3a5f1d11862fbaaca94ff25f1d9cc1309e2 (diff) | |
| parent | 66c126d6dee178f96f8a120f13372802d46ea9b5 (diff) | |
| download | podman-e7540d0406c49b22de245246d16ebc6e1778df37.tar.gz podman-e7540d0406c49b22de245246d16ebc6e1778df37.tar.bz2 podman-e7540d0406c49b22de245246d16ebc6e1778df37.zip | |
Merge pull request #4310 from nalind/manifest-lists
Move to containers/image v5, support manifest lists
Diffstat (limited to 'cmd/podman/build.go')
| -rw-r--r-- | cmd/podman/build.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index f4efea544..e9ebc50aa 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -9,6 +9,7 @@ import ( "github.com/containers/buildah" "github.com/containers/buildah/imagebuildah" buildahcli "github.com/containers/buildah/pkg/cli" + "github.com/containers/image/v5/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/adapter" @@ -360,7 +361,11 @@ func buildCmd(c *cliconfig.BuildValues) error { RuntimeArgs: runtimeFlags, SignaturePolicyPath: c.SignaturePolicy, Squash: c.Squash, - Target: c.Target, + SystemContext: &types.SystemContext{ + OSChoice: c.OverrideOS, + ArchitectureChoice: c.OverrideArch, + }, + Target: c.Target, } return runtime.Build(getContext(), c, options, containerfiles) } |