Added latest bits of docker build

builder.go

@@ -12,8 +12,8 @@ import (
 
 	docker "github.com/fsouza/go-dockerclient"
 
-	"github.com/docker/docker/builder/command"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/command"
+	"github.com/docker/docker/builder/dockerfile/parser"
 )
 
 // Copy defines a copy operation required on the container.
@@ -222,7 +222,9 @@ func (b *Builder) FromImage(image *docker.Image, node *parser.Node) error {
 	if image.Config == nil || len(image.Config.OnBuild) == 0 {
 		return nil
 	}
-	extra, err := parser.Parse(bytes.NewBufferString(strings.Join(image.Config.OnBuild, "\n")))
+	d := parser.Directive{LookingForDirectives: true}
+	parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
+	extra, err := parser.Parse(bytes.NewBufferString(strings.Join(image.Config.OnBuild, "\n")), &d)
 	if err != nil {
 		return err
 	}

builder_test.go

@@ -7,17 +7,20 @@ import (
 	"testing"
 
 	"fmt"
-	"github.com/docker/docker/builder/parser"
-	docker "github.com/fsouza/go-dockerclient"
 	"reflect"
+
+	"github.com/docker/docker/builder/dockerfile/parser"
+	docker "github.com/fsouza/go-dockerclient"
 )
 
 func TestRun(t *testing.T) {
 	f, err := os.Open("dockerclient/testdata/Dockerfile.add")
 	if err != nil {
 		t.Fatal(err)
 	}
-	node, err := parser.Parse(f)
+	d := parser.Directive{LookingForDirectives: true}
+	parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
+	node, err := parser.Parse(f, &d)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -136,7 +139,7 @@ func TestBuilder(t *testing.T) {
 			From:       "busybox",
 			Unrecognized: []Step{
 				Step{Command: "health", Message: "HEALTH ", Original: "HEALTH NONE", Args: []string{""}, Flags: []string{}, Env: []string{}},
-				Step{Command: "shell", Message: "SHELL ", Original: "SHELL [\"/bin/sh\", \"-c\"]", Args: []string{""}, Flags: []string{}, Env: []string{}},
+				Step{Command: "shell", Message: "SHELL /bin/sh -c", Original: "SHELL [\"/bin/sh\", \"-c\"]", Args: []string{"/bin/sh", "-c"}, Flags: []string{}, Env: []string{}, Attrs: map[string]bool{"json": true}},
 				Step{Command: "unrecognized", Message: "UNRECOGNIZED ", Original: "UNRECOGNIZED", Args: []string{""}, Env: []string{}},
 			},
 			Config: docker.Config{
@@ -178,7 +181,9 @@ func TestBuilder(t *testing.T) {
 			t.Errorf("%d: %v", i, err)
 			continue
 		}
-		node, err := parser.Parse(bytes.NewBuffer(data))
+		d := parser.Directive{LookingForDirectives: true}
+		parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
+		node, err := parser.Parse(bytes.NewBuffer(data), &d)
 		if err != nil {
 			t.Errorf("%d: %v", i, err)
 			continue

dockerclient/client.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	dockertypes "github.com/docker/engine-api/types"
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
@@ -105,7 +105,9 @@ func (e *ClientExecutor) Build(r io.Reader, args map[string]string) error {
 
 	// TODO: check the Docker daemon version (1.20 is required for Upload)
 
-	node, err := parser.Parse(r)
+	d := parser.Directive{LookingForDirectives: true}
+	parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
+	node, err := parser.Parse(r, &d)
 	if err != nil {
 		return err
 	}

dockerclient/conformance_test.go

@@ -17,8 +17,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/builder/command"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/command"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
 	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils"
@@ -197,7 +197,9 @@ func conformanceTester(t *testing.T, c *docker.Client, test conformanceTest, i i
 		t.Errorf("%d: unable to read Dockerfile %q: %v", i, input, err)
 		return
 	}
-	node, err := parser.Parse(bytes.NewBuffer(data))
+	d := parser.Directive{LookingForDirectives: true}
+	parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
+	node, err := parser.Parse(bytes.NewBuffer(data), &d)
 	if err != nil {
 		t.Errorf("%d: can't parse Dockerfile %q: %v", i, input, err)
 		return

evaluator.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/builder/command"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/command"
+	"github.com/docker/docker/builder/dockerfile/parser"
 )
 
 // Environment variable interpolation will happen on these statements only.