kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #28725 from Microsoft/jjh/builderenvcaseinsensitive

Browse source 
Windows: Builder case insensitive env
This commit is contained in:
Doug Davis 2016-11-30 08:33:29 -05:00 • committed by GitHub
commit 4a0e295cd1
6 changed files with 177 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builder/dockerfile/dispatchers.go
View file

@ -71,14 +71,20 @@ func env(b *Builder, args []string, attributes map[string]bool, original string)
if len(args[j]) == 0 { if len(args[j]) == 0 {
return errBlankCommandNames("ENV") return errBlankCommandNames("ENV")
} }
newVar := args[j] + "=" + args[j+1] + "" newVar := args[j] + "=" + args[j+1] + ""
commitStr += " " + newVar commitStr += " " + newVar
gotOne := false gotOne := false
for i, envVar := range b.runConfig.Env { for i, envVar := range b.runConfig.Env {
envParts := strings.SplitN(envVar, "=", 2) envParts := strings.SplitN(envVar, "=", 2)
if envParts[0] == args[j] { compareFrom := envParts[0]
compareTo := args[j]
if runtime.GOOS == "windows" {
// Case insensitive environment variables on Windows
compareFrom = strings.ToUpper(compareFrom)
compareTo = strings.ToUpper(compareTo)
}
if compareFrom == compareTo {
b.runConfig.Env[i] = newVar b.runConfig.Env[i] = newVar
gotOne = true gotOne = true
break break

228
builder/dockerfile/envVarTest
View file

@ -1,112 +1,116 @@
hello | hello A|hello | hello
he'll'o | hello A|he'll'o | hello
he'llo | hello A|he'llo | hello
he\'llo | he'llo A|he\'llo | he'llo
he\\'llo | he\llo A|he\\'llo | he\llo
abc\tdef | abctdef A|abc\tdef | abctdef
"abc\tdef" | abc\tdef A|"abc\tdef" | abc\tdef
'abc\tdef' | abc\tdef A|'abc\tdef' | abc\tdef
hello\ | hello A|hello\ | hello
hello\\ | hello\ A|hello\\ | hello\
"hello | hello A|"hello | hello
"hello\" | hello" A|"hello\" | hello"
"hel'lo" | hel'lo A|"hel'lo" | hel'lo
'hello | hello A|'hello | hello
'hello\' | hello\ A|'hello\' | hello\
"''" | '' A|"''" | ''
$. | $. A|$. | $.
$1 | A|$1 |
he$1x | hex A|he$1x | hex
he$.x | he$.x A|he$.x | he$.x
he$pwd. | he. # Next one is different on Windows as $pwd==$PWD
he$PWD | he/home U|he$pwd. | he.
he\$PWD | he$PWD W|he$pwd. | he/home.
he\\$PWD | he\/home A|he$PWD | he/home
he\${} | he${} A|he\$PWD | he$PWD
he\${}xx | he${}xx A|he\\$PWD | he\/home
he${} | he A|he\${} | he${}
he${}xx | hexx A|he\${}xx | he${}xx
he${hi} | he A|he${} | he
he${hi}xx | hexx A|he${}xx | hexx
he${PWD} | he/home A|he${hi} | he
he${.} | error A|he${hi}xx | hexx
he${XXX:-000}xx | he000xx A|he${PWD} | he/home
he${PWD:-000}xx | he/homexx A|he${.} | error
he${XXX:-$PWD}xx | he/homexx A|he${XXX:-000}xx | he000xx
he${XXX:-${PWD:-yyy}}xx | he/homexx A|he${PWD:-000}xx | he/homexx
he${XXX:-${YYY:-yyy}}xx | heyyyxx A|he${XXX:-$PWD}xx | he/homexx
he${XXX:YYY} | error A|he${XXX:-${PWD:-yyy}}xx | he/homexx
he${XXX:+${PWD}}xx | hexx A|he${XXX:-${YYY:-yyy}}xx | heyyyxx
he${PWD:+${XXX}}xx | hexx A|he${XXX:YYY} | error
he${PWD:+${SHELL}}xx | hebashxx A|he${XXX:+${PWD}}xx | hexx
he${XXX:+000}xx | hexx A|he${PWD:+${XXX}}xx | hexx
he${PWD:+000}xx | he000xx A|he${PWD:+${SHELL}}xx | hebashxx
'he${XX}' | he${XX} A|he${XXX:+000}xx | hexx
"he${PWD}" | he/home A|he${PWD:+000}xx | he000xx
"he'$PWD'" | he'/home' A|'he${XX}' | he${XX}
"$PWD" | /home A|"he${PWD}" | he/home
'$PWD' | $PWD A|"he'$PWD'" | he'/home'
'\$PWD' | \$PWD A|"$PWD" | /home
'"hello"' | "hello" A|'$PWD' | $PWD
he\$PWD | he$PWD A|'\$PWD' | \$PWD
"he\$PWD" | he$PWD A|'"hello"' | "hello"
'he\$PWD' | he\$PWD A|he\$PWD | he$PWD
he${PWD | error A|"he\$PWD" | he$PWD
he${PWD:=000}xx | error A|'he\$PWD' | he\$PWD
he${PWD:+${PWD}:}xx | he/home:xx A|he${PWD | error
he${XXX:-\$PWD:}xx | he$PWD:xx A|he${PWD:=000}xx | error
he${XXX:-\${PWD}z}xx | he${PWDz}xx A|he${PWD:+${PWD}:}xx | he/home:xx
안녕하세요 | 안녕하세요 A|he${XXX:-\$PWD:}xx | he$PWD:xx
안'녕'하세요 | 안녕하세요 A|he${XXX:-\${PWD}z}xx | he${PWDz}xx
안'녕하세요 | 안녕하세요 A|안녕하세요 | 안녕하세요
안녕\'하세요 | 안녕'하세요 A|안'녕'하세요 | 안녕하세요
안\\'녕하세요 | 안\녕하세요 A|안'녕하세요 | 안녕하세요
안녕\t하세요 | 안녕t하세요 A|안녕\'하세요 | 안녕'하세요
"안녕\t하세요" | 안녕\t하세요 A|안\\'녕하세요 | 안\녕하세요
'안녕\t하세요 | 안녕\t하세요 A|안녕\t하세요 | 안녕t하세요
안녕하세요\ | 안녕하세요 A|"안녕\t하세요" | 안녕\t하세요
안녕하세요\\ | 안녕하세요\ A|'안녕\t하세요 | 안녕\t하세요
"안녕하세요 | 안녕하세요 A|안녕하세요\ | 안녕하세요
"안녕하세요\" | 안녕하세요" A|안녕하세요\\ | 안녕하세요\
"안녕'하세요" | 안녕'하세요 A|"안녕하세요 | 안녕하세요
'안녕하세요 | 안녕하세요 A|"안녕하세요\" | 안녕하세요"
'안녕하세요\' | 안녕하세요\ A|"안녕'하세요" | 안녕'하세요
안녕$1x | 안녕x A|'안녕하세요 | 안녕하세요
안녕$.x | 안녕$.x A|'안녕하세요\' | 안녕하세요\
안녕$pwd. | 안녕. A|안녕$1x | 안녕x
안녕$PWD | 안녕/home A|안녕$.x | 안녕$.x
안녕\$PWD | 안녕$PWD # Next one is different on Windows as $pwd==$PWD
안녕\\$PWD | 안녕\/home U|안녕$pwd. | 안녕.
안녕\${} | 안녕${} W|안녕$pwd. | 안녕/home.
안녕\${}xx | 안녕${}xx A|안녕$PWD | 안녕/home
안녕${} | 안녕 A|안녕\$PWD | 안녕$PWD
안녕${}xx | 안녕xx A|안녕\\$PWD | 안녕\/home
안녕${hi} | 안녕 A|안녕\${} | 안녕${}
안녕${hi}xx | 안녕xx A|안녕\${}xx | 안녕${}xx
안녕${PWD} | 안녕/home A|안녕${} | 안녕
안녕${.} | error A|안녕${}xx | 안녕xx
안녕${XXX:-000}xx | 안녕000xx A|안녕${hi} | 안녕
안녕${PWD:-000}xx | 안녕/homexx A|안녕${hi}xx | 안녕xx
안녕${XXX:-$PWD}xx | 안녕/homexx A|안녕${PWD} | 안녕/home
안녕${XXX:-${PWD:-yyy}}xx | 안녕/homexx A|안녕${.} | error
안녕${XXX:-${YYY:-yyy}}xx | 안녕yyyxx A|안녕${XXX:-000}xx | 안녕000xx
안녕${XXX:YYY} | error A|안녕${PWD:-000}xx | 안녕/homexx
안녕${XXX:+${PWD}}xx | 안녕xx A|안녕${XXX:-$PWD}xx | 안녕/homexx
안녕${PWD:+${XXX}}xx | 안녕xx A|안녕${XXX:-${PWD:-yyy}}xx | 안녕/homexx
안녕${PWD:+${SHELL}}xx | 안녕bashxx A|안녕${XXX:-${YYY:-yyy}}xx | 안녕yyyxx
안녕${XXX:+000}xx | 안녕xx A|안녕${XXX:YYY} | error
안녕${PWD:+000}xx | 안녕000xx A|안녕${XXX:+${PWD}}xx | 안녕xx
'안녕${XX}' | 안녕${XX} A|안녕${PWD:+${XXX}}xx | 안녕xx
"안녕${PWD}" | 안녕/home A|안녕${PWD:+${SHELL}}xx | 안녕bashxx
"안녕'$PWD'" | 안녕'/home' A|안녕${XXX:+000}xx | 안녕xx
'"안녕"' | "안녕" A|안녕${PWD:+000}xx | 안녕000xx
안녕\$PWD | 안녕$PWD A|'안녕${XX}' | 안녕${XX}
"안녕\$PWD" | 안녕$PWD A|"안녕${PWD}" | 안녕/home
'안녕\$PWD' | 안녕\$PWD A|"안녕'$PWD'" | 안녕'/home'
안녕${PWD | error A|'"안녕"' | "안녕"
안녕${PWD:=000}xx | error A|안녕\$PWD | 안녕$PWD
안녕${PWD:+${PWD}:}xx | 안녕/home:xx A|"안녕\$PWD" | 안녕$PWD
안녕${XXX:-\$PWD:}xx | 안녕$PWD:xx A|'안녕\$PWD' | 안녕\$PWD
안녕${XXX:-\${PWD}z}xx | 안녕${PWDz}xx A|안녕${PWD | error
$KOREAN | 한국어 A|안녕${PWD:=000}xx | error
안녕$KOREAN | 안녕한국어 A|안녕${PWD:+${PWD}:}xx | 안녕/home:xx
A|안녕${XXX:-\$PWD:}xx | 안녕$PWD:xx
A|안녕${XXX:-\${PWD}z}xx | 안녕${PWDz}xx
A|$KOREAN | 한국어
A|안녕$KOREAN | 안녕한국어

14
builder/dockerfile/shell_parser.go
View file

@ -8,6 +8,7 @@ package dockerfile
import ( import (
"fmt" "fmt"
"runtime"
"strings" "strings"
"text/scanner" "text/scanner"
"unicode" "unicode"
@ -298,9 +299,16 @@ func (sw *shellWord) processName() string {
} }
func (sw *shellWord) getEnv(name string) string { func (sw *shellWord) getEnv(name string) string {
if runtime.GOOS == "windows" {
// Case-insensitive environment variables on Windows
name = strings.ToUpper(name)
}
for _, env := range sw.envs { for _, env := range sw.envs {
i := strings.Index(env, "=") i := strings.Index(env, "=")
if i < 0 { if i < 0 {
if runtime.GOOS == "windows" {
env = strings.ToUpper(env)
}
if name == env { if name == env {
// Should probably never get here, but just in case treat // Should probably never get here, but just in case treat
// it like "var" and "var=" are the same // it like "var" and "var=" are the same
@ -308,7 +316,11 @@ func (sw *shellWord) getEnv(name string) string {
} }
continue continue
} }
if name != env[:i] { compareName := env[:i]
if runtime.GOOS == "windows" {
compareName = strings.ToUpper(compareName)
}
if name != compareName {
continue continue
} }
return env[i+1:] return env[i+1:]

26
builder/dockerfile/shell_parser_test.go
View file

@ -3,12 +3,14 @@ package dockerfile
import ( import (
"bufio" "bufio"
"os" "os"
"runtime"
"strings" "strings"
"testing" "testing"
) )
func TestShellParser4EnvVars(t *testing.T) { func TestShellParser4EnvVars(t *testing.T) {
fn := "envVarTest" fn := "envVarTest"
lineCount := 0
file, err := os.Open(fn) file, err := os.Open(fn)
if err != nil { if err != nil {
@ -20,6 +22,7 @@ func TestShellParser4EnvVars(t *testing.T) {
envs := []string{"PWD=/home", "SHELL=bash", "KOREAN=한국어"} envs := []string{"PWD=/home", "SHELL=bash", "KOREAN=한국어"}
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
lineCount++
// Trim comments and blank lines // Trim comments and blank lines
i := strings.Index(line, "#") i := strings.Index(line, "#")
@ -33,21 +36,30 @@ func TestShellParser4EnvVars(t *testing.T) {
} }
words := strings.Split(line, "|") words := strings.Split(line, "|")
if len(words) != 2 { if len(words) != 3 {
t.Fatalf("Error in '%s' - should be exactly one | in:%q", fn, line) t.Fatalf("Error in '%s' - should be exactly one | in:%q", fn, line)
} }
words[0] = strings.TrimSpace(words[0]) words[0] = strings.TrimSpace(words[0])
words[1] = strings.TrimSpace(words[1]) words[1] = strings.TrimSpace(words[1])
words[2] = strings.TrimSpace(words[2])
newWord, err := ProcessWord(words[0], envs, '\\') // Key W=Windows; A=All; U=Unix
if (words[0] != "W") && (words[0] != "A") && (words[0] != "U") {
if err != nil { t.Fatalf("Invalid tag %s at line %d of %s. Must be W, A or U", words[0], lineCount, fn)
newWord = "error"
} }
if newWord != words[1] { if ((words[0] == "W" || words[0] == "A") && runtime.GOOS == "windows") ||
t.Fatalf("Error. Src: %s Calc: %s Expected: %s", words[0], newWord, words[1]) ((words[0] == "U" || words[0] == "A") && runtime.GOOS != "windows") {
newWord, err := ProcessWord(words[1], envs, '\\')
if err != nil {
newWord = "error"
}
if newWord != words[2] {
t.Fatalf("Error. Src: %s Calc: %s Expected: %s at line %d", words[1], newWord, words[2], lineCount)
}
} }
} }
} }

5
daemon/commit.go
View file

@ -46,6 +46,11 @@ func merge(userConf, imageConf *containertypes.Config) error {
imageEnvKey := strings.Split(imageEnv, "=")[0] imageEnvKey := strings.Split(imageEnv, "=")[0]
for _, userEnv := range userConf.Env { for _, userEnv := range userConf.Env {
userEnvKey := strings.Split(userEnv, "=")[0] userEnvKey := strings.Split(userEnv, "=")[0]
if runtime.GOOS == "windows" {
// Case insensitive environment variables on Windows
imageEnvKey = strings.ToUpper(imageEnvKey)
userEnvKey = strings.ToUpper(userEnvKey)
}
if imageEnvKey == userEnvKey { if imageEnvKey == userEnvKey {
found = true found = true
break break

16
integration-cli/docker_cli_build_test.go
View file

@ -7311,3 +7311,19 @@ RUN ["cat", "/foo/file"]
c.Fatal(err) c.Fatal(err)
} }
} }
// Case-insensitive environment variables on Windows
func (s *DockerSuite) TestBuildWindowsEnvCaseInsensitive(c *check.C) {
testRequires(c, DaemonIsWindows)
name := "testbuildwindowsenvcaseinsensitive"
if _, err := buildImage(name, `
FROM `+WindowsBaseImage+`
ENV FOO=bar foo=bar
`, true); err != nil {
c.Fatal(err)
}
res := inspectFieldJSON(c, name, "Config.Env")
if res != `["foo=bar"]` { // Should not have FOO=bar in it - takes the last one processed. And only one entry as deduped.
c.Fatalf("Case insensitive environment variables on Windows failed. Got %s", res)
}
}