Merge pull request openshift#229 from flouthoc/consider-buildinargs-userargs-from-eval

dispatcher: consider `builtinargs` and `userargs` while processing `baseImage` name

Author: openshift-ci[bot]

builder_test.go

@@ -16,6 +16,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 
 	"github.com/openshift/imagebuilder/dockerfile/parser"
+	"github.com/containerd/containerd/platforms"
 )
 
 func TestVolumeSet(t *testing.T) {
@@ -209,6 +210,46 @@ RUN echo $FOO $BAR`))
 	}
 }
 
+// Test if `FROM some-${SOME-BUILT-IN-ARG}` args gets resolved correctly.
+func TestArgResolutionOfDefaultVariables(t *testing.T) {
+	// Get architecture from host
+	var localspec = platforms.DefaultSpec()
+	for _, tc := range []struct {
+		dockerfile   string
+		name         string
+		args         map[string]string
+		expectedFrom string
+	}{
+		{name: "use-default-built-arg",
+			dockerfile:   "FROM platform-${TARGETARCH}",
+			args:         map[string]string{"FOO": "bar"},
+			expectedFrom: "platform-" + localspec.Architecture},
+		{name: "override-default-built-arg",
+			dockerfile:   "FROM platform-${TARGETARCH}",
+			args:         map[string]string{"TARGETARCH": "bar"},
+			expectedFrom: "platform-bar"},
+		{name: "random-built-arg",
+			dockerfile:   "FROM ${FOO}",
+			args:         map[string]string{"FOO": "bar"},
+			expectedFrom: "bar"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			n, err := ParseDockerfile(strings.NewReader(tc.dockerfile))
+			if err != nil {
+				t.Fatal(err)
+			}
+			b := NewBuilder(tc.args)
+			from, err := b.From(n)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if from != tc.expectedFrom {
+				t.Fatalf("expected %s, got %s", tc.expectedFrom, from)
+			}
+		})
+	}
+}
+
 func resolveNodeArgs(b *Builder, node *parser.Node) error {
 	for _, c := range node.Children {
 		if c.Value != "arg" {

dispatchers.go

@@ -223,8 +223,12 @@ 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)
+	userArgs := mergeEnv(envMapAsSlice(b.Args), b.Env)
+	userArgs = mergeEnv(defaultArgs, userArgs)
+	nameArgs := mergeEnv(argStrs, userArgs)
 	var err error
-	if name, err = ProcessWord(name, argStrs); err != nil {
+	if name, err = ProcessWord(name, nameArgs); err != nil {
 		return err
 	}
 
@@ -234,9 +238,6 @@ func from(b *Builder, args []string, attributes map[string]bool, flagArgs []stri
 			return fmt.Errorf("Windows does not support FROM scratch")
 		}
 	}
-	defaultArgs := envMapAsSlice(builtinBuildArgs)
-	userArgs := mergeEnv(envMapAsSlice(b.Args), b.Env)
-	userArgs = mergeEnv(defaultArgs, userArgs)
 	for _, a := range flagArgs {
 		arg, err := ProcessWord(a, userArgs)
 		if err != nil {