GitList

Browse code

Some fixed for new LABEL stuff

- command.Commands was missing "Label"
- used the correct error string in dispatcher when LABEL has no args, otherwise
the test TestBuildMissingArgs will not work
- removed the premature error msg in line_parser that was blocking the
label() func in dispatcher from showing the err msg in previous bullet
- since LABEL uses the env parser it needs to be added to the replaceEnvAllowed
list so that proper quote processing will be done. Especially once
PR #10431 is merged.

Signed-off-by: Doug Davis <dug@us.ibm.com>

Doug Davis authored on 2015/03/17 14:23:40
Showing 4 changed files

builder/command/command.go index dd24ee4..16544f0 100644
builder/dispatchers.go index 965fd68..3cb3a9f 100644
builder/evaluator.go index aee6042..9808a3c 100644
builder/parser/line_parsers.go index 06115e8..45c929e 100644

builder/command/command.go

History View file @ 6784a77

@@ -22,6 +22,7 @@ const (
                      // Commands is list of all Dockerfile commands
                      var Commands = map[string]struct{}{
                      	Env:        {},
                     +	Label:      {},
                      	Maintainer: {},
                      	Add:        {},
                      	Copy:       {},

builder/dispatchers.go

History View file @ 6784a77

@@ -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

builder/evaluator.go

History View file @ 6784a77

@@ -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: {},

builder/parser/line_parsers.go

History View file @ 6784a77

@@ -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)

...	...	@@ -137,7 +137,7 @@ func parseNameVal(rest string, key string) (*Node, map[string]bool, error) {
137	137	}
138	138
139	139	if len(words) == 0 {
140		- return nil, nil, fmt.Errorf(key + " requires at least one argument")
	140	+ return nil, nil, nil
141	141	}
142	142
143	143	// Old format (KEY name value)