Merge pull request #10914 from kargakis/map-commands

Map Commands instead of using them as a slice
This commit is contained in:
Tibor Vass 2015-02-20 10:32:04 -08:00
commit c5aca86654
2 changed files with 16 additions and 16 deletions

View File

@ -19,19 +19,19 @@ const (
) )
// Commands is list of all Dockerfile commands // Commands is list of all Dockerfile commands
var Commands = []string{ var Commands = map[string]struct{}{
Env, Env: {},
Maintainer, Maintainer: {},
Add, Add: {},
Copy, Copy: {},
From, From: {},
Onbuild, Onbuild: {},
Workdir, Workdir: {},
Run, Run: {},
Cmd, Cmd: {},
Entrypoint, Entrypoint: {},
Expose, Expose: {},
Volume, Volume: {},
User, User: {},
Insert, Insert: {},
} }

View File

@ -4836,7 +4836,7 @@ func TestBuildMissingArgs(t *testing.T) {
defer deleteAllContainers() defer deleteAllContainers()
for _, cmd := range command.Commands { for cmd := range command.Commands {
cmd = strings.ToUpper(cmd) cmd = strings.ToUpper(cmd)
if _, ok := skipCmds[cmd]; ok { if _, ok := skipCmds[cmd]; ok {
continue continue