diff options
Diffstat (limited to 'vendor/github.com/containers/buildah/config.go')
| -rw-r--r-- | vendor/github.com/containers/buildah/config.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/containers/buildah/config.go b/vendor/github.com/containers/buildah/config.go index a9883a595..fde35529a 100644 --- a/vendor/github.com/containers/buildah/config.go +++ b/vendor/github.com/containers/buildah/config.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/containerd/containerd/platforms" "github.com/containers/buildah/define" "github.com/containers/buildah/docker" + internalUtil "github.com/containers/buildah/internal/util" "github.com/containers/common/pkg/util" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/pkg/compression" @@ -136,7 +136,16 @@ func (b *Builder) fixupConfig(sys *types.SystemContext) { b.SetArchitecture(runtime.GOARCH) } // in case the arch string we started with was shorthand for a known arch+variant pair, normalize it - ps := platforms.Normalize(ociv1.Platform{OS: b.OS(), Architecture: b.Architecture(), Variant: b.Variant()}) + ps := internalUtil.NormalizePlatform(ociv1.Platform{OS: b.OS(), Architecture: b.Architecture(), Variant: b.Variant()}) + b.SetArchitecture(ps.Architecture) + b.SetVariant(ps.Variant) + } + if b.Variant() == "" { + if sys != nil && sys.VariantChoice != "" { + b.SetVariant(sys.VariantChoice) + } + // in case the arch string we started with was shorthand for a known arch+variant pair, normalize it + ps := internalUtil.NormalizePlatform(ociv1.Platform{OS: b.OS(), Architecture: b.Architecture(), Variant: b.Variant()}) b.SetArchitecture(ps.Architecture) b.SetVariant(ps.Variant) } |