deleted file mode 100644

@@ -1,11 +0,0 @@

-FROM busybox

-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

-RUN echo 'dockerio:x:1001:' >> /etc/group

-RUN touch /exists

-RUN chown dockerio.dockerio exists

-ADD test_dir /test_dir

-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]

-RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]

-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]

-RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '-rw-r--r--' ]

-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

@@ -269,35 +269,28 @@ RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,

 }

 func TestBuildAddWholeDirToRoot(t *testing.T) {

-	testDirName := "WholeDirToRoot"

-	sourceDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd", testDirName)

-	buildDirectory, err := ioutil.TempDir("", "test-build-add")

-	defer os.RemoveAll(buildDirectory)

-

-	err = copyWithCP(sourceDirectory, buildDirectory)

+	name := "testaddwholedirtoroot"

+	defer deleteImages(name)

+	ctx, err := fakeContext(`FROM busybox

+RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

+RUN echo 'dockerio:x:1001:' >> /etc/group

+RUN touch /exists

+RUN chown dockerio.dockerio exists

+ADD test_dir /test_dir

+RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]

+RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]

+RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]

+RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '-rw-r--r--' ]

+RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

+		map[string]string{

+			"test_dir/test_file": "test1",

+		})

 	if err != nil {

-		t.Fatalf("failed to copy files to temporary directory: %s", err)

-	}

-

-	buildDirectory = filepath.Join(buildDirectory, testDirName)

-	test_dir := filepath.Join(buildDirectory, "test_dir")

-	if err := os.MkdirAll(test_dir, 0755); err != nil {

 		t.Fatal(err)

 	}

-	f, err := os.OpenFile(filepath.Join(test_dir, "test_file"), os.O_CREATE, 0644)

-	if err != nil {

+	if _, err := buildImageFromContext(name, ctx, true); err != nil {

 		t.Fatal(err)

 	}

-	f.Close()

-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", ".")

-	errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))

-

-	if err != nil || exitCode != 0 {

-		t.Fatal("failed to build the image")

-	}

-

-	deleteImages("testaddimg")

-

 	logDone("build - add whole directory to root")

 }