Fixed merge conflict from master

pkg/util/command_util.go

@@ -18,6 +18,8 @@ package util
 
 import (
 	"github.com/docker/docker/builder/dockerfile/instructions"
+	"github.com/docker/docker/builder/dockerfile/parser"
+	"github.com/docker/docker/builder/dockerfile/shell"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"os"
@@ -25,6 +27,45 @@ import (
 	"strings"
 )
 
+// ResolveEnvironmentReplacement resolves a list of values by calling resolveEnvironmentReplacement
+func ResolveEnvironmentReplacementList(values, envs []string, isFilepath bool) ([]string, error) {
+	var resolvedValues []string
+	for _, value := range values {
+		resolved, err := ResolveEnvironmentReplacement(value, envs, isFilepath)
+		logrus.Debugf("Resolved %s to %s", value, resolved)
+		if err != nil {
+			return nil, err
+		}
+		resolvedValues = append(resolvedValues, resolved)
+	}
+	return resolvedValues, nil
+}
+
+// ResolveEnvironmentReplacement resolves replacing env variables in some text from envs
+// It takes in a string representation of the command, the value to be resolved, and a list of envs (config.Env)
+// Ex: fp = $foo/newdir, envs = [foo=/foodir], then this should return /foodir/newdir
+// The dockerfile/shell package handles processing env values
+// It handles escape characters and supports expansion from the config.Env array
+// Shlex handles some of the following use cases (these and more are tested in integration tests)
+// ""a'b'c"" -> "a'b'c"
+// "Rex\ The\ Dog \" -> "Rex The Dog"
+// "a\"b" -> "a"b"
+func ResolveEnvironmentReplacement(value string, envs []string, isFilepath bool) (string, error) {
+	shlex := shell.NewLex(parser.DefaultEscapeToken)
+	fp, err := shlex.ProcessWord(value, envs)
+	if !isFilepath {
+		return fp, err
+	}
+	if err != nil {
+		return "", err
+	}
+	fp = filepath.Clean(fp)
+	if IsDestDir(value) {
+		fp = fp + "/"
+	}
+	return fp, nil
+}
+
 // ContainsWildcards returns true if any entry in paths contains wildcards
 func ContainsWildcards(paths []string) bool {
 	for _, path := range paths {

pkg/util/command_util_test.go

@@ -22,6 +22,88 @@ import (
 	"testing"
 )
 
+var testEnvReplacement = []struct {
+	path         string
+	command      string
+	envs         []string
+	isFilepath   bool
+	expectedPath string
+}{
+	{
+		path:    "/simple/path",
+		command: "WORKDIR /simple/path",
+		envs: []string{
+			"simple=/path/",
+		},
+		isFilepath:   true,
+		expectedPath: "/simple/path",
+	},
+	{
+		path:    "/simple/path/",
+		command: "WORKDIR /simple/path/",
+		envs: []string{
+			"simple=/path/",
+		},
+		isFilepath:   true,
+		expectedPath: "/simple/path/",
+	},
+	{
+		path:    "${a}/b",
+		command: "WORKDIR ${a}/b",
+		envs: []string{
+			"a=/path/",
+			"b=/path2/",
+		},
+		isFilepath:   true,
+		expectedPath: "/path/b",
+	},
+	{
+		path:    "/$a/b",
+		command: "COPY ${a}/b /c/",
+		envs: []string{
+			"a=/path/",
+			"b=/path2/",
+		},
+		isFilepath:   true,
+		expectedPath: "/path/b",
+	},
+	{
+		path:    "/$a/b/",
+		command: "COPY /${a}/b /c/",
+		envs: []string{
+			"a=/path/",
+			"b=/path2/",
+		},
+		isFilepath:   true,
+		expectedPath: "/path/b/",
+	},
+	{
+		path:    "\\$foo",
+		command: "COPY \\$foo /quux",
+		envs: []string{
+			"foo=/path/",
+		},
+		isFilepath:   true,
+		expectedPath: "$foo",
+	},
+	{
+		path:    "8080/$protocol",
+		command: "EXPOSE 8080/$protocol",
+		envs: []string{
+			"protocol=udp",
+		},
+		expectedPath: "8080/udp",
+	},
+}
+
+func Test_EnvReplacement(t *testing.T) {
+	for _, test := range testEnvReplacement {
+		actualPath, err := ResolveEnvironmentReplacement(test.path, test.envs, test.isFilepath)
+		testutil.CheckErrorAndDeepEqual(t, false, err, test.expectedPath, actualPath)
+
+	}
+}
+
 var buildContextPath = "../../integration_tests/"
 
 var destinationFilepathTests = []struct {