From 84015b2fb75586636311e3dcd24f9b7fbc07099e Mon Sep 17 00:00:00 2001 From: Aditya R Date: Fri, 2 Jun 2023 12:56:41 +0530 Subject: [PATCH] pkg/imagebuilder: expose BuiltInBuildArgs for downstream Expose map BuiltInBuildArgs so downstream users like buildah can use it. Signed-off-by: Aditya R --- dispatchers.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dispatchers.go b/dispatchers.go index f264876c1..aa5696878 100644 --- a/dispatchers.go +++ b/dispatchers.go @@ -31,7 +31,7 @@ var ( var localspec = platforms.DefaultSpec() // https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope -var builtinBuildArgs = map[string]string{ +var BuiltInBuildArgs = map[string]string{ "TARGETPLATFORM": localspec.OS + "/" + localspec.Architecture, "TARGETOS": localspec.OS, "TARGETARCH": localspec.Architecture, @@ -44,8 +44,8 @@ var builtinBuildArgs = map[string]string{ func init() { if localspec.Variant != "" { - builtinBuildArgs["TARGETPLATFORM"] = builtinBuildArgs["TARGETPLATFORM"] + "/" + localspec.Variant - builtinBuildArgs["BUILDPLATFORM"] = builtinBuildArgs["BUILDPLATFORM"] + "/" + localspec.Variant + BuiltInBuildArgs["TARGETPLATFORM"] = BuiltInBuildArgs["TARGETPLATFORM"] + "/" + localspec.Variant + BuiltInBuildArgs["BUILDPLATFORM"] = BuiltInBuildArgs["BUILDPLATFORM"] + "/" + localspec.Variant } } @@ -224,7 +224,7 @@ func from(b *Builder, args []string, attributes map[string]bool, flagArgs []stri for n, v := range b.HeadingArgs { argStrs = append(argStrs, n+"="+v) } - defaultArgs := envMapAsSlice(builtinBuildArgs) + defaultArgs := envMapAsSlice(BuiltInBuildArgs) filteredUserArgs := make(map[string]string) for k, v := range b.UserArgs { for _, a := range b.GlobalAllowedArgs { @@ -634,7 +634,7 @@ func arg(b *Builder, args []string, attributes map[string]bool, flagArgs []strin b.Args["TARGETPLATFORM"] = b.Args["TARGETPLATFORM"] + "/" + p.Variant } } - } else if val, ok := builtinBuildArgs[arg]; ok { + } else if val, ok := BuiltInBuildArgs[arg]; ok { name = arg value = val hasDefault = true