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

deleted file mode 100644

@@ -1,176 +0,0 @@

-package builder

-

-import (

-	"fmt"

-	"strings"

-)

-

-// FlagType is the type of the build flag

-type FlagType int

-

-const (

-	boolType FlagType = iota

-	stringType

-)

-

-// BFlags contains all flags information for the builder

-type BFlags struct {

-	Args  []string // actual flags/args from cmd line

-	flags map[string]*Flag

-	used  map[string]*Flag

-	Err   error

-}

-

-// Flag contains all information for a flag

-type Flag struct {

-	bf       *BFlags

-	name     string

-	flagType FlagType

-	Value    string

-}

-

-// NewBFlags return the new BFlags struct

-func NewBFlags() *BFlags {

-	return &BFlags{

-		flags: make(map[string]*Flag),

-		used:  make(map[string]*Flag),

-	}

-}

-

-// AddBool adds a bool flag to BFlags

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) AddBool(name string, def bool) *Flag {

-	flag := bf.addFlag(name, boolType)

-	if flag == nil {

-		return nil

-	}

-	if def {

-		flag.Value = "true"

-	} else {

-		flag.Value = "false"

-	}

-	return flag

-}

-

-// AddString adds a string flag to BFlags

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) AddString(name string, def string) *Flag {

-	flag := bf.addFlag(name, stringType)

-	if flag == nil {

-		return nil

-	}

-	flag.Value = def

-	return flag

-}

-

-// addFlag is a generic func used by the other AddXXX() func

-// to add a new flag to the BFlags struct.

-// Note, any error will be generated when Parse() is called (see Parse).

-func (bf *BFlags) addFlag(name string, flagType FlagType) *Flag {

-	if _, ok := bf.flags[name]; ok {

-		bf.Err = fmt.Errorf("Duplicate flag defined: %s", name)

-		return nil

-	}

-

-	newFlag := &Flag{

-		bf:       bf,

-		name:     name,

-		flagType: flagType,

-	}

-	bf.flags[name] = newFlag

-

-	return newFlag

-}

-

-// IsUsed checks if the flag is used

-func (fl *Flag) IsUsed() bool {

-	if _, ok := fl.bf.used[fl.name]; ok {

-		return true

-	}

-	return false

-}

-

-// IsTrue checks if a bool flag is true

-func (fl *Flag) IsTrue() bool {

-	if fl.flagType != boolType {

-		// Should never get here

-		panic(fmt.Errorf("Trying to use IsTrue on a non-boolean: %s", fl.name))

-	}

-	return fl.Value == "true"

-}

-

-// Parse parses and checks if the BFlags is valid.

-// Any error noticed during the AddXXX() funcs will be generated/returned

-// here.  We do this because an error during AddXXX() is more like a

-// compile time error so it doesn't matter too much when we stop our

-// processing as long as we do stop it, so this allows the code

-// around AddXXX() to be just:

-//     defFlag := AddString("desription", "")

-// w/o needing to add an if-statement around each one.

-func (bf *BFlags) Parse() error {

-	// If there was an error while defining the possible flags

-	// go ahead and bubble it back up here since we didn't do it

-	// earlier in the processing

-	if bf.Err != nil {

-		return fmt.Errorf("Error setting up flags: %s", bf.Err)

-	}

-

-	for _, arg := range bf.Args {

-		if !strings.HasPrefix(arg, "--") {

-			return fmt.Errorf("Arg should start with -- : %s", arg)

-		}

-

-		if arg == "--" {

-			return nil

-		}

-

-		arg = arg[2:]

-		value := ""

-

-		index := strings.Index(arg, "=")

-		if index >= 0 {

-			value = arg[index+1:]

-			arg = arg[:index]

-		}

-

-		flag, ok := bf.flags[arg]

-		if !ok {

-			return fmt.Errorf("Unknown flag: %s", arg)

-		}

-

-		if _, ok = bf.used[arg]; ok {

-			return fmt.Errorf("Duplicate flag specified: %s", arg)

-		}

-

-		bf.used[arg] = flag

-

-		switch flag.flagType {

-		case boolType:

-			// value == "" is only ok if no "=" was specified

-			if index >= 0 && value == "" {

-				return fmt.Errorf("Missing a value on flag: %s", arg)

-			}

-

-			lower := strings.ToLower(value)

-			if lower == "" {

-				flag.Value = "true"

-			} else if lower == "true" || lower == "false" {

-				flag.Value = lower

-			} else {

-				return fmt.Errorf("Expecting boolean value for flag %s, not: %s", arg, value)

-			}

-

-		case stringType:

-			if index < 0 {

-				return fmt.Errorf("Missing a value on flag: %s", arg)

-			}

-			flag.Value = value

-

-		default:

-			panic(fmt.Errorf("No idea what kind of flag we have! Should never get here!"))

-		}

-

-	}

-

-	return nil

-}

deleted file mode 100644

@@ -1,187 +0,0 @@

-package builder

-

-import (

-	"testing"

-)

-

-func TestBuilderFlags(t *testing.T) {

-	var expected string

-	var err error

-

-	// ---

-

-	bf := NewBFlags()

-	bf.Args = []string{}

-	if err := bf.Parse(); err != nil {

-		t.Fatalf("Test1 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	bf.Args = []string{"--"}

-	if err := bf.Parse(); err != nil {

-		t.Fatalf("Test2 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 := bf.AddString("str1", "")

-	flBool1 := bf.AddBool("bool1", false)

-	bf.Args = []string{}

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test3 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.IsUsed() == true {

-		t.Fatalf("Test3 - str1 was not used!")

-	}

-	if flBool1.IsUsed() == true {

-		t.Fatalf("Test3 - bool1 was not used!")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test4 of %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.Value != "HI" {

-		t.Fatalf("Str1 was supposed to default to: HI")

-	}

-	if flBool1.IsTrue() {

-		t.Fatalf("Bool1 was supposed to default to: false")

-	}

-	if flStr1.IsUsed() == true {

-		t.Fatalf("Str1 was not used!")

-	}

-	if flBool1.IsUsed() == true {

-		t.Fatalf("Bool1 was not used!")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1="}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	expected = ""

-	if flStr1.Value != expected {

-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	bf.Args = []string{"--str1=BYE"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	expected = "BYE"

-	if flStr1.Value != expected {

-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if !flBool1.IsTrue() {

-		t.Fatalf("Test-b1 Bool1 was supposed to be true")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=true"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if !flBool1.IsTrue() {

-		t.Fatalf("Test-b2 Bool1 was supposed to be true")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=false"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flBool1.IsTrue() {

-		t.Fatalf("Test-b3 Bool1 was supposed to be false")

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1=false1"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool2"}

-

-	if err = bf.Parse(); err == nil {

-		t.Fatalf("Test %q was supposed to fail", bf.Args)

-	}

-

-	// ---

-

-	bf = NewBFlags()

-	flStr1 = bf.AddString("str1", "HI")

-	flBool1 = bf.AddBool("bool1", false)

-	bf.Args = []string{"--bool1", "--str1=BYE"}

-

-	if err = bf.Parse(); err != nil {

-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)

-	}

-

-	if flStr1.Value != "BYE" {

-		t.Fatalf("Teset %s, str1 should be BYE", bf.Args)

-	}

-	if !flBool1.IsTrue() {

-		t.Fatalf("Teset %s, bool1 should be true", bf.Args)

-	}

-}

deleted file mode 100644

@@ -1,42 +0,0 @@

-// Package command contains the set of Dockerfile commands.

-package command

-

-// Define constants for the command strings

-const (

-	Env        = "env"

-	Label      = "label"

-	Maintainer = "maintainer"

-	Add        = "add"

-	Copy       = "copy"

-	From       = "from"

-	Onbuild    = "onbuild"

-	Workdir    = "workdir"

-	Run        = "run"

-	Cmd        = "cmd"

-	Entrypoint = "entrypoint"

-	Expose     = "expose"

-	Volume     = "volume"

-	User       = "user"

-	StopSignal = "stopsignal"

-	Arg        = "arg"

-)

-

-// Commands is list of all Dockerfile commands

-var Commands = map[string]struct{}{

-	Env:        {},

-	Label:      {},

-	Maintainer: {},

-	Add:        {},

-	Copy:       {},

-	From:       {},

-	Onbuild:    {},

-	Workdir:    {},

-	Run:        {},

-	Cmd:        {},

-	Entrypoint: {},

-	Expose:     {},

-	Volume:     {},

-	User:       {},

-	StopSignal: {},

-	Arg:        {},

-}

deleted file mode 100644

@@ -1,650 +0,0 @@

-package builder

-

-// This file contains the dispatchers for each command. Note that

-// `nullDispatch` is not actually a command, but support for commands we parse

-// but do nothing with.

-//

-// See evaluator.go for a higher level discussion of the whole evaluator

-// package.

-

-import (

-	"fmt"

-	"io/ioutil"

-	"os"

-	"path/filepath"

-	"regexp"

-	"runtime"

-	"sort"

-	"strings"

-

-	"github.com/Sirupsen/logrus"

-	derr "github.com/docker/docker/errors"

-	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/pkg/nat"

-	"github.com/docker/docker/pkg/signal"

-	"github.com/docker/docker/pkg/stringutils"

-	"github.com/docker/docker/pkg/system"

-	"github.com/docker/docker/runconfig"

-)

-

-const (

-	// NoBaseImageSpecifier is the symbol used by the FROM

-	// command to specify that no base image is to be used.

-	NoBaseImageSpecifier string = "scratch"

-)

-

-// dispatch with no layer / parsing. This is effectively not a command.

-func nullDispatch(b *builder, args []string, attributes map[string]bool, original string) error {

-	return nil

-}

-

-// ENV foo bar

-//

-// Sets the environment variable foo to bar, also makes interpolation

-// in the dockerfile available from the next statement on via ${foo}.

-//

-func env(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) == 0 {

-		return derr.ErrorCodeAtLeastOneArg.WithArgs("ENV")

-	}

-

-	if len(args)%2 != 0 {

-		// should never get here, but just in case

-		return derr.ErrorCodeTooManyArgs.WithArgs("ENV")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	// TODO/FIXME/NOT USED

-	// Just here to show how to use the builder flags stuff within the

-	// context of a builder command. Will remove once we actually add

-	// a builder command to something!

-	/*

-		flBool1 := b.BuilderFlags.AddBool("bool1", false)

-		flStr1 := b.BuilderFlags.AddString("str1", "HI")

-

-		if err := b.BuilderFlags.Parse(); err != nil {

-			return err

-		}

-

-		fmt.Printf("Bool1:%v\n", flBool1)

-		fmt.Printf("Str1:%v\n", flStr1)

-	*/

-

-	commitStr := "ENV"

-

-	for j := 0; j < len(args); j++ {

-		// name  ==> args[j]

-		// value ==> args[j+1]

-		newVar := args[j] + "=" + args[j+1] + ""

-		commitStr += " " + newVar

-

-		gotOne := false

-		for i, envVar := range b.Config.Env {

-			envParts := strings.SplitN(envVar, "=", 2)

-			if envParts[0] == args[j] {

-				b.Config.Env[i] = newVar

-				gotOne = true

-				break

-			}

-		}

-		if !gotOne {

-			b.Config.Env = append(b.Config.Env, newVar)

-		}

-		j++

-	}

-

-	return b.commit("", b.Config.Cmd, commitStr)

-}

-

-// MAINTAINER some text <maybe@an.email.address>

-//

-// Sets the maintainer metadata.

-func maintainer(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) != 1 {

-		return derr.ErrorCodeExactlyOneArg.WithArgs("MAINTAINER")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	b.maintainer = args[0]

-	return b.commit("", b.Config.Cmd, fmt.Sprintf("MAINTAINER %s", b.maintainer))

-}

-

-// LABEL some json data describing the image

-//

-// Sets the Label variable foo to bar,

-//

-func label(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) == 0 {

-		return derr.ErrorCodeAtLeastOneArg.WithArgs("LABEL")

-	}

-	if len(args)%2 != 0 {

-		// should never get here, but just in case

-		return derr.ErrorCodeTooManyArgs.WithArgs("LABEL")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	commitStr := "LABEL"

-

-	if b.Config.Labels == nil {

-		b.Config.Labels = map[string]string{}

-	}

-

-	for j := 0; j < len(args); j++ {

-		// name  ==> args[j]

-		// value ==> args[j+1]

-		newVar := args[j] + "=" + args[j+1] + ""

-		commitStr += " " + newVar

-

-		b.Config.Labels[args[j]] = args[j+1]

-		j++

-	}

-	return b.commit("", b.Config.Cmd, commitStr)

-}

-

-// ADD foo /path

-//

-// Add the file 'foo' to '/path'. Tarball and Remote URL (git, http) handling

-// exist here. If you do not wish to have this automatic handling, use COPY.

-//

-func add(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) < 2 {

-		return derr.ErrorCodeAtLeastTwoArgs.WithArgs("ADD")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	return b.runContextCommand(args, true, true, "ADD")

-}

-

-// COPY foo /path

-//

-// Same as 'ADD' but without the tar and remote url handling.

-//

-func dispatchCopy(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) < 2 {

-		return derr.ErrorCodeAtLeastTwoArgs.WithArgs("COPY")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	return b.runContextCommand(args, false, false, "COPY")

-}

-

-// FROM imagename

-//

-// This sets the image the dockerfile will build on top of.

-//

-func from(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) != 1 {

-		return derr.ErrorCodeExactlyOneArg.WithArgs("FROM")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	name := args[0]

-

-	// Windows cannot support a container with no base image.

-	if name == NoBaseImageSpecifier {

-		if runtime.GOOS == "windows" {

-			return fmt.Errorf("Windows does not support FROM scratch")

-		}

-		b.image = ""

-		b.noBaseImage = true

-		return nil

-	}

-

-	image, err := b.Daemon.Repositories().LookupImage(name)

-	if b.Pull {

-		image, err = b.pullImage(name)

-		if err != nil {

-			return err

-		}

-	}

-	if err != nil {

-		if b.Daemon.Graph().IsNotExist(err, name) {

-			image, err = b.pullImage(name)

-		}

-

-		// note that the top level err will still be !nil here if IsNotExist is

-		// not the error. This approach just simplifies the logic a bit.

-		if err != nil {

-			return err

-		}

-	}

-

-	return b.processImageFrom(image)

-}

-

-// ONBUILD RUN echo yo

-//

-// ONBUILD triggers run when the image is used in a FROM statement.

-//

-// ONBUILD handling has a lot of special-case functionality, the heading in

-// evaluator.go and comments around dispatch() in the same file explain the

-// special cases. search for 'OnBuild' in internals.go for additional special

-// cases.

-//

-func onbuild(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) == 0 {

-		return derr.ErrorCodeAtLeastOneArg.WithArgs("ONBUILD")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	triggerInstruction := strings.ToUpper(strings.TrimSpace(args[0]))

-	switch triggerInstruction {

-	case "ONBUILD":

-		return derr.ErrorCodeChainOnBuild

-	case "MAINTAINER", "FROM":

-		return derr.ErrorCodeBadOnBuildCmd.WithArgs(triggerInstruction)

-	}

-

-	original = regexp.MustCompile(`(?i)^\s*ONBUILD\s*`).ReplaceAllString(original, "")

-

-	b.Config.OnBuild = append(b.Config.OnBuild, original)

-	return b.commit("", b.Config.Cmd, fmt.Sprintf("ONBUILD %s", original))

-}

-

-// WORKDIR /tmp

-//

-// Set the working directory for future RUN/CMD/etc statements.

-//

-func workdir(b *builder, args []string, attributes map[string]bool, original string) error {

-	if len(args) != 1 {

-		return derr.ErrorCodeExactlyOneArg.WithArgs("WORKDIR")

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	// This is from the Dockerfile and will not necessarily be in platform

-	// specific semantics, hence ensure it is converted.

-	workdir := filepath.FromSlash(args[0])

-

-	if !system.IsAbs(workdir) {

-		current := filepath.FromSlash(b.Config.WorkingDir)

-		workdir = filepath.Join(string(os.PathSeparator), current, workdir)

-	}

-

-	b.Config.WorkingDir = workdir

-

-	return b.commit("", b.Config.Cmd, fmt.Sprintf("WORKDIR %v", workdir))

-}

-

-// RUN some command yo

-//

-// run a command and commit the image. Args are automatically prepended with

-// 'sh -c' under linux or 'cmd /S /C' under Windows, in the event there is

-// only one argument. The difference in processing:

-//

-// RUN echo hi          # sh -c echo hi       (Linux)

-// RUN echo hi          # cmd /S /C echo hi   (Windows)

-// RUN [ "echo", "hi" ] # echo hi

-//

-func run(b *builder, args []string, attributes map[string]bool, original string) error {

-	if b.image == "" && !b.noBaseImage {

-		return derr.ErrorCodeMissingFrom

-	}

-

-	if err := b.BuilderFlags.Parse(); err != nil {

-		return err

-	}

-

-	args = handleJSONArgs(args, attributes)

-

-	if !attributes["json"] {

-		if runtime.GOOS != "windows" {

-			args = append([]string{"/bin/sh", "-c"}, args...)

-		} else {

-			args = append([]string{"cmd", "/S", "/C"}, args...)

-		}

-	}

-

-	runCmd := flag.NewFlagSet("run", flag.ContinueOnError)

-	runCmd.SetOutput(ioutil.Discard)

-	runCmd.Usage = nil

-

-	config, _, _, err := runconfig.Parse(runCmd, append([]string{b.image}, args...))

-	if err != nil {

-		return err

-	}

-

-	// stash the cmd

-	cmd := b.Config.Cmd

-	runconfig.Merge(b.Config, config)

-	// stash the config environment

-	env := b.Config.Env

-

-	defer func(cmd *stringutils.StrSlice) { b.Config.Cmd = cmd }(cmd)

-	defer func(env []string) { b.Config.Env = env }(env)

-

-	// derive the net build-time environment for this run. We let config

-	// environment override the build time environment.

-	// This means that we take the b.buildArgs list of env vars and remove

-	// any of those variables that are defined as part of the container. In other

-	// words, anything in b.Config.Env. What's left is the list of build-time env

-	// vars that we need to add to each RUN command - note the list could be empty.

-	//

-	// We don't persist the build time environment with container's config

-	// environment, but just sort and prepend it to the command string at time

-	// of commit.

-	// This helps with tracing back the image's actual environment at the time