Merge pull request moby#11437 from duglin/FixLabels

Some fixes for new LABEL stuff
delftswa2014 · Mar 17, 2015 · ad56b5c · ad56b5c
2 parents b6ac111 + 6784a77
commit ad56b5c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/builder/command/command.go b/builder/command/command.go
@@ -22,6 +22,7 @@ const (
 // Commands is list of all Dockerfile commands
 var Commands = map[string]struct{}{
 	Env:        {},
+	Label:      {},
 	Maintainer: {},
 	Add:        {},
 	Copy:       {},

diff --git a/builder/dispatchers.go b/builder/dispatchers.go
@@ -91,7 +91,7 @@ func maintainer(b *Builder, args []string, attributes map[string]bool, original
 //
 func label(b *Builder, args []string, attributes map[string]bool, original string) error {
 	if len(args) == 0 {
-		return fmt.Errorf("LABEL is missing arguments")
+		return fmt.Errorf("LABEL requires at least one argument")
 	}
 	if len(args)%2 != 0 {
 		// should never get here, but just in case

diff --git a/builder/evaluator.go b/builder/evaluator.go
@@ -49,6 +49,7 @@ var (
 // Environment variable interpolation will happen on these statements only.
 var replaceEnvAllowed = map[string]struct{}{
 	command.Env:     {},
+	command.Label:   {},
 	command.Add:     {},
 	command.Copy:    {},
 	command.Workdir: {},

diff --git a/builder/parser/line_parsers.go b/builder/parser/line_parsers.go
@@ -137,7 +137,7 @@ func parseNameVal(rest string, key string) (*Node, map[string]bool, error) {
 	}
 
 	if len(words) == 0 {
-		return nil, nil, fmt.Errorf(key + " requires at least one argument")
+		return nil, nil, nil
 	}
 
 	// Old format (KEY name value)