diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 06:21:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 06:21:58 -0400 |
| commit | aff64dda65514064ccbf7fcaf78293e111539eb6 (patch) | |
| tree | 395ab38c3a486f0dd43fa157c8b2899782053d26 /cmd/podman | |
| parent | 07e9bf340a83ecb7174e32fb565826c21a9a91ca (diff) | |
| parent | 5dbf3ee7aeef6e2aca5512b3ad8684610080d421 (diff) | |
| download | podman-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 'cmd/podman')
| -rw-r--r-- | cmd/podman/images/build.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index a1a28b809..31d014dfe 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -476,7 +476,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil runtimeFlags = append(runtimeFlags, "--systemd-cgroup") } - imageOS, arch, err := parse.PlatformFromOptions(c) + platforms, err := parse.PlatformsFromOptions(c) if err != nil { return nil, err } @@ -490,7 +490,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil AddCapabilities: flags.CapAdd, AdditionalTags: tags, Annotations: flags.Annotation, - Architecture: arch, Args: args, BlobDirectory: flags.BlobCache, CNIConfigDir: flags.CNIConfigDir, @@ -516,11 +515,11 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil MaxPullPushRetries: 3, NamespaceOptions: nsValues, NoCache: flags.NoCache, - OS: imageOS, OciDecryptConfig: decConfig, Out: stdout, Output: output, OutputFormat: format, + Platforms: platforms, PullPolicy: pullPolicy, PullPushRetryDelay: 2 * time.Second, Quiet: flags.Quiet, |