Add automatic platform args in the global scope

dispatchers.go

@@ -21,12 +21,34 @@ import (
 
 	"github.com/openshift/imagebuilder/signal"
 	"github.com/openshift/imagebuilder/strslice"
+	"github.com/containerd/containerd/platforms"
 )
 
 var (
 	obRgex = regexp.MustCompile(`(?i)^\s*ONBUILD\s*`)
 )
 
+var localspec = platforms.DefaultSpec()
+
+// https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+var builtinBuildArgs = map[string]string{
+	"TARGETPLATFORM": localspec.OS + "/" + localspec.Architecture,
+	"TARGETOS":       localspec.OS,
+	"TARGETARCH":     localspec.Architecture,
+	"TARGETVARIANT":  localspec.Variant,
+	"BUILDPLATFORM":  localspec.OS + "/" + localspec.Architecture,
+	"BUILDOS":        localspec.OS,
+	"BUILDARCH":      localspec.Architecture,
+	"BUILDVARIANT":   localspec.Variant,
+}
+
+func init() {
+	if localspec.Variant != "" {
+		builtinBuildArgs["TARGETPLATFORM"] = builtinBuildArgs["TARGETPLATFORM"] + "/" + localspec.Variant
+		builtinBuildArgs["BUILDPLATFORM"] = builtinBuildArgs["BUILDPLATFORM"] + "/" + localspec.Variant
+	}
+}
+
 // ENV foo bar
 //
 // Sets the environment variable foo to bar, also makes interpolation
@@ -516,6 +538,9 @@ func healthcheck(b *Builder, args []string, attributes map[string]bool, flagArgs
 	return nil
 }
 
+
+var targetArgs = []string {"TARGETOS", "TARGETARCH", "TARGETVARIANT"}
+
 // ARG name[=value]
 //
 // Adds the variable foo to the trusted list of variables that can be passed
@@ -543,6 +568,26 @@ func arg(b *Builder, args []string, attributes map[string]bool, flagArgs []strin
 		name = parts[0]
 		value = parts[1]
 		hasDefault = true
+		if name == "TARGETPLATFORM" {
+			p, err := platforms.Parse(value)
+			if err != nil {
+				return fmt.Errorf("error parsing TARGETPLATFORM argument")
+			}
+			for _, val := range targetArgs {
+				b.AllowedArgs[val] = true
+			}
+			b.Args["TARGETPLATFORM"] = p.OS + "/" + p.Architecture
+			b.Args["TARGETOS"] = p.OS
+			b.Args["TARGETARCH"] = p.Architecture
+			b.Args["TARGETVARIANT"] = p.Variant
+			if p.Variant != "" {
+				b.Args["TARGETPLATFORM"] = b.Args["TARGETPLATFORM"] + "/" + p.Variant
+			}
+		}
+	} else if val, ok := builtinBuildArgs[arg]; ok {
+		name = arg
+		value = val
+		hasDefault = true
 	} else {
 		name = arg
 		hasDefault = false

dispatchers_test.go

@@ -3,10 +3,64 @@ package imagebuilder
 import (
 	"reflect"
 	"testing"
+	"sort"
+	"errors"
+	"github.com/containerd/containerd/platforms"
 
 	docker "github.com/fsouza/go-dockerclient"
 )
 
+func TestDispatchArgDefaultBuiltins(t *testing.T) {
+	mybuilder := *NewBuilder(make(map[string]string))
+	args := []string{"TARGETPLATFORM"}
+	if err := arg(&mybuilder, args, nil, nil, ""); err != nil {
+		t.Errorf("arg error: %v", err)
+	}
+	args = []string{"BUILDARCH"}
+	if err := arg(&mybuilder, args, nil, nil, ""); err != nil {
+		t.Errorf("arg(2) error: %v", err)
+	}
+	localspec := platforms.DefaultSpec()
+	expectedArgs := []string {
+		"BUILDARCH=" + localspec.Architecture,
+		"TARGETPLATFORM=" + localspec.OS + "/" + localspec.Architecture,
+	}
+	got := mybuilder.Arguments()
+	sort.Strings(got)
+	if !reflect.DeepEqual(got, expectedArgs) {
+		t.Errorf("Expected %v, got %v\n", expectedArgs, got)
+	}
+}
+
+func TestDispatchArgTargetPlatform(t *testing.T) {
+	mybuilder := *NewBuilder(make(map[string]string))
+	args := []string{"TARGETPLATFORM=linux/arm/v7"}
+	if err := arg(&mybuilder, args, nil, nil, ""); err != nil {
+		t.Errorf("arg error: %v", err)
+	}
+	expectedArgs := []string {
+		"TARGETARCH=arm",
+		"TARGETOS=linux",
+		"TARGETPLATFORM=linux/arm/v7",
+		"TARGETVARIANT=v7",
+	}
+	got := mybuilder.Arguments()
+	sort.Strings(got)
+	if !reflect.DeepEqual(got, expectedArgs) {
+		t.Errorf("Expected %v, got %v\n", expectedArgs, got)
+	}
+}
+
+func TestDispatchArgTargetPlatformBad(t *testing.T) {
+	mybuilder := *NewBuilder(make(map[string]string))
+	args := []string{"TARGETPLATFORM=bozo"}
+	err := arg(&mybuilder, args, nil, nil, "")
+	expectedErr := errors.New("error parsing TARGETPLATFORM argument")
+	if !reflect.DeepEqual(err, expectedErr) {
+		t.Errorf("Expected %v, got %v\n", expectedErr, err)
+	}
+}
+
 func TestDispatchCopy(t *testing.T) {
 	mybuilder := Builder{
 		RunConfig: docker.Config{

vendor.conf

@@ -1,4 +1,5 @@
 github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109
+github.com/containerd/containerd v1.3.0
 github.com/containers/storage v1.2
 github.com/docker/docker b68221c37ee597950364788204546f9c9d0e46a1
 github.com/docker/go-connections 97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e
@@ -18,3 +19,7 @@ golang.org/x/crypto ff983b9c42bc9fbf91556e191cc8efb585c16908
 golang.org/x/net 45ffb0cd1ba084b73e26dee67e667e1be5acce83
 golang.org/x/sys 7fbe1cd0fcc20051e1fcb87fbabec4a1bacaaeba
 k8s.io/klog 8e90cee79f823779174776412c13478955131846
+google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0
+github.com/golang/protobuf v1.2.0
+google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
+