@@ -17,8 +17,8 @@ import (

 	"github.com/golang/glog"

 	"golang.org/x/net/context"

+	"github.com/openshift/imagebuilder/imageprogress"

 	starterrors "github.com/openshift/origin/pkg/bootstrap/docker/errors"

-	"github.com/openshift/origin/pkg/util/docker/dockerfile/builder/imageprogress"

 )

 const openShiftInsecureCIDR = "172.30.0.0/16"

@@ -15,7 +15,7 @@ import (

 	s2iapi "github.com/openshift/source-to-image/pkg/api"

 	"github.com/openshift/source-to-image/pkg/tar"

-	"github.com/openshift/origin/pkg/util/docker/dockerfile/builder/imageprogress"

+	"github.com/openshift/imagebuilder/imageprogress"

 )

 var (

deleted file mode 100644

@@ -1,192 +0,0 @@

-

-                                 Apache License

-                           Version 2.0, January 2004

-                        https://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   Copyright 2013-2016 Docker, Inc.

-   Copyright 2016 The OpenShift Authors

-

-   Licensed under the Apache License, Version 2.0 (the "License");

-   you may not use this file except in compliance with the License.

-   You may obtain a copy of the License at

-

-       https://www.apache.org/licenses/LICENSE-2.0

-

-   Unless required by applicable law or agreed to in writing, software

-   distributed under the License is distributed on an "AS IS" BASIS,

-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-   See the License for the specific language governing permissions and

-   limitations under the License.

deleted file mode 100644

@@ -1,293 +0,0 @@

-package builder

-

-import (

-	"bytes"

-	"fmt"

-	"io/ioutil"

-	"log"

-	"os"

-	"path/filepath"

-	"runtime"

-	"strings"

-

-	docker "github.com/fsouza/go-dockerclient"

-

-	"github.com/docker/docker/builder/command"

-	"github.com/docker/docker/builder/parser"

-)

-

-// Copy defines a copy operation required on the container.

-type Copy struct {

-	Src      string

-	Dest     []string

-	Download bool

-}

-

-// Run defines a run operation required in the container.

-type Run struct {

-	Shell bool

-	Args  []string

-}

-

-type Executor interface {

-	Copy(copies ...Copy) error

-	Run(run Run, config docker.Config) error

-}

-

-type logExecutor struct{}

-

-func (logExecutor) Copy(copies ...Copy) error {

-	for _, c := range copies {

-		log.Printf("COPY %s -> %v (download:%t)", c.Src, c.Dest, c.Download)

-	}

-	return nil

-}

-

-func (logExecutor) Run(run Run, config docker.Config) error {

-	log.Printf("RUN %v %t (%v)", run.Args, run.Shell, config.Env)

-	return nil

-}

-

-type noopExecutor struct{}

-

-func (noopExecutor) Copy(copies ...Copy) error {

-	return nil

-}

-

-func (noopExecutor) Run(run Run, config docker.Config) error {

-	return nil

-}

-

-var (

-	LogExecutor  = logExecutor{}

-	NoopExecutor = noopExecutor{}

-)

-

-type Builder struct {

-	RunConfig docker.Config

-

-	Env    []string

-	Args   map[string]string

-	CmdSet bool

-	Author string

-

-	AllowedArgs map[string]bool

-

-	PendingRuns   []Run

-	PendingCopies []Copy

-

-	Executor Executor

-}

-

-func NewBuilder() *Builder {

-	args := make(map[string]bool)

-	for k, v := range builtinAllowedBuildArgs {

-		args[k] = v

-	}

-	return &Builder{

-		Args:        make(map[string]string),

-		AllowedArgs: args,

-	}

-}

-

-// Step creates a new step from the current state.

-func (b *Builder) Step() *Step {

-	dst := make([]string, len(b.Env)+len(b.RunConfig.Env))

-	copy(dst, b.Env)

-	dst = append(dst, b.RunConfig.Env...)

-	return &Step{Env: dst}

-}

-

-// Run executes a step, transforming the current builder and

-// invoking any Copy or Run operations.

-func (b *Builder) Run(step *Step, exec Executor) error {

-	fn, ok := evaluateTable[step.Command]

-	if !ok {

-		return fmt.Errorf("Unknown instruction: %s", strings.ToUpper(step.Command))

-	}

-	if err := fn(b, step.Args, step.Attrs, step.Original); err != nil {

-		return err

-	}

-

-	copies := b.PendingCopies

-	b.PendingCopies = nil

-	runs := b.PendingRuns

-	b.PendingRuns = nil

-

-	if err := exec.Copy(copies...); err != nil {

-		return err

-	}

-	for _, run := range runs {

-		config := b.Config()

-		if err := exec.Run(run, *config); err != nil {

-			return err

-		}

-	}

-

-	return nil

-}

-

-// RequiresStart returns true if a running container environment is necessary

-// to invoke the provided commands

-func (b *Builder) RequiresStart(node *parser.Node) bool {

-	for _, child := range node.Children {

-		if child.Value == command.Run {

-			return true

-		}

-	}

-	return false

-}

-

-// Config returns a snapshot of the current RunConfig intended for

-// use with a container commit.

-func (b *Builder) Config() *docker.Config {

-	config := b.RunConfig

-	if config.OnBuild == nil {

-		config.OnBuild = []string{}

-	}

-	if config.Entrypoint == nil {

-		config.Entrypoint = []string{}

-	}

-	config.Image = ""

-	return &config

-}

-

-// Arguments returns the currently active arguments.

-func (b *Builder) Arguments() []string {

-	var envs []string

-	for key, val := range b.Args {

-		if _, ok := b.AllowedArgs[key]; ok {

-			envs = append(envs, fmt.Sprintf("%s=%s", key, val))

-		}

-	}

-	return envs

-}

-

-// ErrNoFROM is returned if the Dockerfile did not contain a FROM

-// statement.

-var ErrNoFROM = fmt.Errorf("no FROM statement found")

-

-// From returns the image this dockerfile depends on, or an error

-// if no FROM is found or if multiple FROM are specified. If a

-// single from is found the passed node is updated with only

-// the remaining statements.  The builder's RunConfig.Image field

-// is set to the first From found, or left unchanged if already

-// set.

-func (b *Builder) From(node *parser.Node) (string, error) {

-	children := SplitChildren(node, command.From)

-	switch {

-	case len(children) == 0:

-		return "", ErrNoFROM

-	case len(children) > 1:

-		return "", fmt.Errorf("multiple FROM statements are not supported")

-	default:

-		step := b.Step()

-		if err := step.Resolve(children[0]); err != nil {

-			return "", err

-		}

-		if err := b.Run(step, NoopExecutor); err != nil {

-			return "", err

-		}

-		return b.RunConfig.Image, nil

-	}

-}

-

-// FromImage updates the builder to use the provided image (resetting RunConfig

-// and recording the image environment), and updates the node with any ONBUILD

-// statements extracted from the parent image.

-func (b *Builder) FromImage(image *docker.Image, node *parser.Node) error {

-	SplitChildren(node, command.From)

-

-	b.RunConfig = *image.Config

-	b.Env = b.RunConfig.Env

-	b.RunConfig.Env = nil

-

-	// Check to see if we have a default PATH, note that windows won't

-	// have one as its set by HCS

-	if runtime.GOOS != "windows" && !hasEnvName(b.Env, "PATH") {

-		b.RunConfig.Env = append(b.RunConfig.Env, "PATH="+defaultPathEnv)

-	}

-

-	// Join the image onbuild statements into node

-	if image.Config == nil || len(image.Config.OnBuild) == 0 {

-		return nil

-	}

-	extra, err := parser.Parse(bytes.NewBufferString(strings.Join(image.Config.OnBuild, "\n")))

-	if err != nil {

-		return err

-	}

-	for _, child := range extra.Children {

-		switch strings.ToUpper(child.Value) {

-		case "ONBUILD":

-			return fmt.Errorf("Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed")

-		case "MAINTAINER", "FROM":

-			return fmt.Errorf("%s isn't allowed as an ONBUILD trigger", child.Value)

-		}

-	}

-	node.Children = append(extra.Children, node.Children...)

-	// Since we've processed the OnBuild statements, clear them from the runconfig state.

-	b.RunConfig.OnBuild = nil

-	return nil

-}

-

-// SplitChildren removes any children with the provided value from node

-// and returns them as an array. node.Children is updated.

-func SplitChildren(node *parser.Node, value string) []*parser.Node {

-	var split []*parser.Node

-	var children []*parser.Node

-	for _, child := range node.Children {

-		if child.Value == value {

-			split = append(split, child)

-		} else {

-			children = append(children, child)

-		}

-	}

-	node.Children = children

-	return split

-}

-

-// StepFunc is invoked with the result of a resolved step.

-type StepFunc func(*Builder, []string, map[string]bool, string) error

-

-var evaluateTable = map[string]StepFunc{

-	command.Env:        env,

-	command.Label:      label,

-	command.Maintainer: maintainer,

-	command.Add:        add,

-	command.Copy:       dispatchCopy, // copy() is a go builtin

-	command.From:       from,

-	command.Onbuild:    onbuild,

-	command.Workdir:    workdir,

-	command.Run:        run,

-	command.Cmd:        cmd,

-	command.Entrypoint: entrypoint,

-	command.Expose:     expose,

-	command.Volume:     volume,

-	command.User:       user,

-	// TODO: use the public constants for these when we update dockerfile/

-	commandStopSignal: stopSignal,

-	commandArg:        arg,

-}

-

-// builtinAllowedBuildArgs is list of built-in allowed build args

-var builtinAllowedBuildArgs = map[string]bool{

-	"HTTP_PROXY":  true,

-	"http_proxy":  true,

-	"HTTPS_PROXY": true,

-	"https_proxy": true,

-	"FTP_PROXY":   true,

-	"ftp_proxy":   true,

-	"NO_PROXY":    true,

-	"no_proxy":    true,

-}

-

-// ParseDockerIgnore returns a list of the excludes in the .dockerignore file.

-// extracted from fsouza/go-dockerclient.

-func ParseDockerignore(root string) ([]string, error) {

-	var excludes []string

-	ignore, err := ioutil.ReadFile(filepath.Join(root, ".dockerignore"))

-	if err != nil && !os.IsNotExist(err) {

-		return excludes, fmt.Errorf("error reading .dockerignore: '%s'", err)

-	}

-	return strings.Split(string(ignore), "\n"), nil

-}

deleted file mode 100644

@@ -1,350 +0,0 @@

-package builder

-

-import (

-	"bytes"

-	"io/ioutil"

-	"os"

-	"testing"

-

-	"fmt"

-	"github.com/docker/docker/builder/parser"

-	docker "github.com/fsouza/go-dockerclient"

-	"reflect"

-)

-

-func TestRun(t *testing.T) {

-	f, err := os.Open("../../../../../images/dockerregistry/Dockerfile")

-	if err != nil {

-		t.Fatal(err)

-	}

-	node, err := parser.Parse(f)

-	if err != nil {

-		t.Fatal(err)

-	}

-	b := NewBuilder()

-	from, err := b.From(node)

-	if err != nil {

-		t.Fatal(err)

-	}

-	if from != "openshift/origin-base" {

-		t.Fatalf("unexpected from: %s", from)

-	}

-	for _, child := range node.Children {

-		step := b.Step()

-		if err := step.Resolve(child); err != nil {

-			t.Fatal(err)

-		}

-		if err := b.Run(step, LogExecutor); err != nil {

-			t.Fatal(err)

-		}

-	}

-	t.Logf("config: %#v", b.Config())

-	t.Logf(node.Dump())

-}

-

-type testExecutor struct {

-	Copies  []Copy

-	Runs    []Run

-	Configs []docker.Config

-	Err     error

-}

-

-func (e *testExecutor) Copy(copies ...Copy) error {

-	e.Copies = append(e.Copies, copies...)

-	return e.Err

-}

-func (e *testExecutor) Run(run Run, config docker.Config) error {

-	e.Runs = append(e.Runs, run)

-	e.Configs = append(e.Configs, config)

-	return e.Err

-}

-

-func TestBuilder(t *testing.T) {

-	testCases := []struct {

-		Dockerfile string

-		From       string

-		Copies     []Copy

-		Runs       []Run

-		Config     docker.Config

-		ErrFn      func(err error) bool

-	}{

-		{

-			Dockerfile: "testdata/dir/Dockerfile",

-			From:       "busybox",

-			Copies: []Copy{

-				{Src: ".", Dest: []string{"/"}, Download: false},

-				{Src: ".", Dest: []string{"/dir"}},

-				{Src: "subdir/", Dest: []string{"/test/"}, Download: false},

-			},

-			Config: docker.Config{

-				Image: "busybox",

-			},

-		},

-		{

-			Dockerfile: "testdata/ignore/Dockerfile",

-			From:       "busybox",

-			Copies: []Copy{

-				{Src: ".", Dest: []string{"/"}},

-			},

-			Config: docker.Config{

-				Image: "busybox",

-			},

-		},

-		{

-			Dockerfile: "testdata/Dockerfile.env",

-			From:       "busybox",

-			Config: docker.Config{

-				Env:   []string{"name=value", "name2=value2a            value2b", "name1=value1", "name3=value3a\\n\"value3b\"", "name4=value4a\\\\nvalue4b"},

-				Image: "busybox",

-			},

-		},

-		{

-			Dockerfile: "testdata/Dockerfile.edgecases",

-			From:       "busybox",

-			Copies: []Copy{

-				{Src: ".", Dest: []string{"/"}, Download: true},

-				{Src: ".", Dest: []string{"/test/copy"}},

-			},

-			Runs: []Run{

-				{Shell: false, Args: []string{"ls", "-la"}},

-				{Shell: false, Args: []string{"echo", "'1234'"}},

-				{Shell: true, Args: []string{"echo \"1234\""}},

-				{Shell: true, Args: []string{"echo 1234"}},

-				{Shell: true, Args: []string{"echo '1234' &&     echo \"456\" &&     echo 789"}},

-				{Shell: true, Args: []string{"sh -c 'echo root:testpass         > /tmp/passwd'"}},

-				{Shell: true, Args: []string{"mkdir -p /test /test2 /test3/test"}},

-			},

-			Config: docker.Config{

-				User:         "docker:root",

-				ExposedPorts: map[docker.Port]struct{}{"6000/tcp": {}, "3000/tcp": {}, "9000/tcp": {}, "5000/tcp": {}},

-				Env:          []string{"SCUBA=1 DUBA 3"},

-				Cmd:          []string{"/bin/sh", "-c", "echo 'test' | wc -"},

-				Image:        "busybox",

-				Volumes:      map[string]struct{}{"/test2": {}, "/test3": {}, "/test": {}},

-				WorkingDir:   "/test",

-				OnBuild:      []string{"RUN [\"echo\", \"test\"]", "RUN echo test", "COPY . /"},

-			},

-		},

-		{

-			Dockerfile: "testdata/Dockerfile.exposedefault",

-			From:       "busybox",

-			Config: docker.Config{

-				ExposedPorts: map[docker.Port]struct{}{"3469/tcp": {}},

-				Image:        "busybox",

-			},

-		},

-		{

-			Dockerfile: "testdata/Dockerfile.add",

-			From:       "busybox",

-			Copies: []Copy{

-				{Src: "https://github.com/openshift/origin/raw/master/README.md", Dest: []string{"/README.md"}, Download: true},

-				{Src: "https://github.com/openshift/origin/raw/master/LICENSE", Dest: []string{"/"}, Download: true},

-				{Src: "https://github.com/openshift/origin/raw/master/LICENSE", Dest: []string{"/A"}, Download: true},

-				{Src: "https://github.com/openshift/origin/raw/master/LICENSE", Dest: []string{"/a"}, Download: true},

-				{Src: "https://github.com/openshift/origin/raw/master/LICENSE", Dest: []string{"/b/a"}, Download: true},

-				{Src: "https://github.com/openshift/origin/raw/master/LICENSE", Dest: []string{"/b/"}, Download: true},

-				{Src: "https://github.com/openshift/ruby-hello-world/archive/master.zip", Dest: []string{"/tmp/"}, Download: true},

-			},

-			Runs: []Run{

-				{Shell: true, Args: []string{"mkdir ./b"}},

-			},

-			Config: docker.Config{

-				Image: "busybox",

-				User:  "root",

-			},

-		},

-	}

-	for i, test := range testCases {

-		data, err := ioutil.ReadFile(test.Dockerfile)

-		if err != nil {

-			t.Errorf("%d: %v", i, err)

-			continue

-		}

-		node, err := parser.Parse(bytes.NewBuffer(data))

-		if err != nil {

-			t.Errorf("%d: %v", i, err)

-			continue

-		}

-		b := NewBuilder()

-		from, err := b.From(node)

-		if err != nil {

-			t.Errorf("%d: %v", i, err)

-			continue

-		}

-		if from != test.From {

-			t.Errorf("%d: unexpected FROM: %s", i, from)

-		}

-		e := &testExecutor{}

-		var lastErr error

-		for j, child := range node.Children {

-			step := b.Step()

-			if err := step.Resolve(child); err != nil {

-				lastErr = fmt.Errorf("%d: %d: %s: resolve: %v", i, j, step.Original, err)

-				break

-			}

-			if err := b.Run(step, e); err != nil {

-				lastErr = fmt.Errorf("%d: %d: %s: run: %v", i, j, step.Original, err)

-				break

-			}

-		}

-		if lastErr != nil {

-			if test.ErrFn == nil || !test.ErrFn(lastErr) {

-				t.Errorf("%d: unexpected error: %v", i, lastErr)

-			}

-			continue

-		}

-		if !reflect.DeepEqual(test.Copies, e.Copies) {

-			t.Errorf("%d: unexpected copies: %#v", i, e.Copies)

-		}

-		if !reflect.DeepEqual(test.Runs, e.Runs) {

-			t.Errorf("%d: unexpected runs: %#v", i, e.Runs)

-		}

-		lastConfig := b.RunConfig

-		if !reflect.DeepEqual(test.Config, lastConfig) {

-			t.Errorf("%d: unexpected config: %#v", i, lastConfig)

-		}

-	}

-}

-

-func TestCalcCopyInfo(t *testing.T) {

-	nilErr := func(err error) bool { return err == nil }

-	tests := []struct {

-		origPath       string

-		rootPath       string

-		dstPath        string

-		allowWildcards bool

-		errFn          func(err error) bool

-		paths          map[string]struct{}

-		excludes       []string

-		rebaseNames    map[string]string

-	}{

-		{

-			origPath:       "subdir/*",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths:          map[string]struct{}{"subdir/file2": {}},

-		},

-		{

-			origPath:       "*",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"Dockerfile": {},

-				"file":       {},

-				"subdir":     {},

-			},

-		},

-		{

-			origPath:       ".",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"Dockerfile": {},

-				"file":       {},

-				"subdir":     {},

-			},

-		},

-		{

-			origPath:       "/.",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"Dockerfile": {},

-				"file":       {},

-				"subdir":     {},

-			},

-		},

-		{

-			origPath:       "subdir/",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"subdir/": {},

-			},

-		},

-		{

-			origPath:       "subdir",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"subdir": {},

-			},

-		},

-		{

-			origPath:       "subdir/.",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"subdir/": {},

-			},

-		},

-		{

-			origPath:       "testdata/dir/subdir/.",

-			rootPath:       "",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"testdata/dir/subdir/": {},

-			},

-		},

-		{

-			origPath:       "subdir/",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"subdir/": {},

-			},

-		},

-		{

-			origPath:       "subdir/",

-			rootPath:       "testdata/dir",

-			allowWildcards: true,

-			errFn:          nilErr,

-			paths: map[string]struct{}{

-				"subdir/": {},

-			},

-			dstPath: "test/",

-			rebaseNames: map[string]string{

-				"subdir/": "test/",

-			},

-		},

-	}

-

-	for i, test := range tests {

-		infos, err := CalcCopyInfo(test.origPath, test.rootPath, false, test.allowWildcards)

-		if !test.errFn(err) {

-			t.Errorf("%d: unexpected error: %v", i, err)

-			continue

-		}

-		if err != nil {

-			continue

-		}

-		expect := make(map[string]struct{})

-		for k := range test.paths {

-			expect[k] = struct{}{}

-		}

-		for _, info := range infos {

-			if _, ok := expect[info.Path]; ok {

-				delete(expect, info.Path)

-			} else {

-				t.Errorf("%d: did not expect path %s", i, info.Path)

-			}

-		}

-		if len(expect) > 0 {

-			t.Errorf("%d: did not see paths: %#v", i, expect)

-		}

-

-		options := archiveOptionsFor(infos, test.dstPath, test.excludes)

-		if !reflect.DeepEqual(test.rebaseNames, options.RebaseNames) {

-			t.Errorf("%d: rebase names did not match: %#v", i, options.RebaseNames)

-		}

-	}

-}

deleted file mode 100644