Move builder files to builder/dockerfile

Signed-off-by: Tibor Vass <tibor@docker.com>

api/server/router/local/image.go

@@ -12,7 +12,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
+	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/graph"
 	"github.com/docker/docker/pkg/ioutils"
@@ -46,7 +46,7 @@ func (s *router) postCommit(ctx context.Context, w http.ResponseWriter, r *http.
 		return err
 	}
 
-	commitCfg := &builder.CommitConfig{
+	commitCfg := &dockerfile.CommitConfig{
 		Pause:   pause,
 		Repo:    r.Form.Get("repo"),
 		Tag:     r.Form.Get("tag"),
@@ -56,7 +56,7 @@ func (s *router) postCommit(ctx context.Context, w http.ResponseWriter, r *http.
 		Config:  c,
 	}
 
-	imgID, err := builder.Commit(cname, s.daemon, commitCfg)
+	imgID, err := dockerfile.Commit(cname, s.daemon, commitCfg)
 	if err != nil {
 		return err
 	}
@@ -125,7 +125,7 @@ func (s *router) postImagesCreate(ctx context.Context, w http.ResponseWriter, r
 		// generated from the download to be available to the output
 		// stream processing below
 		var newConfig *runconfig.Config
-		newConfig, err = builder.BuildFromConfig(s.daemon, &runconfig.Config{}, r.Form["changes"])
+		newConfig, err = dockerfile.BuildFromConfig(s.daemon, &runconfig.Config{}, r.Form["changes"])
 		if err != nil {
 			return err
 		}
@@ -269,7 +269,7 @@ func (s *router) postBuild(ctx context.Context, w http.ResponseWriter, r *http.R
 	var (
 		authConfigs        = map[string]cliconfig.AuthConfig{}
 		authConfigsEncoded = r.Header.Get("X-Registry-Config")
-		buildConfig        = builder.NewBuildConfig()
+		buildConfig        = dockerfile.NewBuildConfig()
 	)
 
 	if authConfigsEncoded != "" {
@@ -347,7 +347,7 @@ func (s *router) postBuild(ctx context.Context, w http.ResponseWriter, r *http.R
 		}()
 	}
 
-	if err := builder.Build(s.daemon, buildConfig); err != nil {
+	if err := dockerfile.Build(s.daemon, buildConfig); err != nil {
 		// Do not write the error in the http output if it's still empty.
 		// This prevents from writing a 200(OK) when there is an interal error.
 		if !output.Flushed() {

builder/bflag.go → builder/dockerfile/bflag.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"fmt"

builder/bflag_test.go → builder/dockerfile/bflag_test.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"testing"

builder/dispatchers.go → builder/dockerfile/dispatchers.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // This file contains the dispatchers for each command. Note that
 // `nullDispatch` is not actually a command, but support for commands we parse

builder/evaluator.go → builder/dockerfile/evaluator.go

@@ -1,4 +1,4 @@
-// Package builder is the evaluation step in the Dockerfile parse/evaluate pipeline.
+// Package dockerfile is the evaluation step in the Dockerfile parse/evaluate pipeline.
 //
 // It incorporates a dispatch table based on the parser.Node values (see the
 // parser package for more information) that are yielded from the parser itself.
@@ -17,7 +17,7 @@
 // before and after each step, such as creating an image ID and removing temporary
 // containers and images. Note that ONBUILD creates a kinda-sorta "sub run" which
 // includes its own set of steps (usually only one of them).
-package builder
+package dockerfile
 
 import (
 	"fmt"
@@ -29,8 +29,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"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"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/pkg/fileutils"

builder/internals.go → builder/dockerfile/internals.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // internals for handling commands. Covers many areas and a lot of
 // non-contiguous functionality. Please read the comments.
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/graph"

builder/internals_unix.go → builder/dockerfile/internals_unix.go

@@ -1,6 +1,6 @@
 // +build freebsd linux
 
-package builder
+package dockerfile
 
 import (
 	"io/ioutil"

builder/internals_windows.go → builder/dockerfile/internals_windows.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package builder
+package dockerfile
 
 import (
 	"io/ioutil"

builder/job.go → builder/dockerfile/job.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bytes"
@@ -12,7 +12,7 @@ import (
 	"sync"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/graph/tags"

builder/job_test.go → builder/dockerfile/job_test.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bytes"

builder/parser/parser.go → builder/dockerfile/parser/parser.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/docker/docker/builder/command"
+	"github.com/docker/docker/builder/dockerfile/command"
 )
 
 // Node is a structure used to represent a parse tree.

builder/shell_parser.go → builder/dockerfile/shell_parser.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // This will take a single word and an array of env variables and
 // process all quotes (" and ') as well as $xxx and ${xxx} env variable

builder/shell_parser_test.go → builder/dockerfile/shell_parser_test.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bufio"

builder/support.go → builder/dockerfile/support.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"regexp"

builder/support_test.go → builder/dockerfile/support_test.go

@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"fmt"

integration-cli/docker_cli_build_test.go

@@ -18,7 +18,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/docker/docker/builder/command"
+	"github.com/docker/docker/builder/dockerfile/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/go-check/check"