COPY: treat absolute source paths as being relative to the contextdir

dockerclient/archive.go

@@ -158,7 +158,7 @@ func archiveFromURL(src, dst, tempDir string, check DirectoryCheck) (io.Reader,
 func archiveFromDisk(directory string, src, dst string, allowDownload bool, excludes []string, check DirectoryCheck) (io.Reader, io.Closer, error) {
 	var err error
 	if filepath.IsAbs(src) {
-		src, err = filepath.Rel(filepath.Dir(src), src)
+		src, err = filepath.Rel(directory, filepath.Join(directory, src))
 		if err != nil {
 			return nil, nil, err
 		}

dockerclient/conformance_test.go

@@ -287,6 +287,21 @@ func TestConformanceInternal(t *testing.T) {
 			Name:       "copy to renamed file",
 			ContextDir: "testdata/copyrename",
 		},
+		{
+			Name:       "copy subdirectory 1",
+			ContextDir: "testdata/copyblahblub",
+			Dockerfile: "Dockerfile",
+		},
+		{
+			Name:       "copy subdirectory 2",
+			ContextDir: "testdata/copyblahblub",
+			Dockerfile: "Dockerfile2",
+		},
+		{
+			Name:       "copy subdirectory 3",
+			ContextDir: "testdata/copyblahblub",
+			Dockerfile: "Dockerfile3",
+		},
 		{
 			Name:       "directory with slash",
 			ContextDir: "testdata/overlapdir",

dockerclient/testdata/copyblahblub/Dockerfile

@@ -0,0 +1,4 @@
+FROM busybox
+COPY firstdir/seconddir /var
+RUN ls -la /var
+RUN ls -la /var/dir-a

dockerclient/testdata/copyblahblub/Dockerfile2

@@ -0,0 +1,4 @@
+FROM busybox
+COPY /firstdir/seconddir /var
+RUN ls -la /var
+RUN ls -la /var/dir-a

dockerclient/testdata/copyblahblub/Dockerfile3

@@ -0,0 +1,4 @@
+FROM busybox
+COPY /firstdir/seconddir/ /var
+RUN ls -la /var
+RUN ls -la /var/dir-a

dockerclient/testdata/copyblahblub/firstdir/seconddir/dir-a/file-a

@@ -0,0 +1 @@
+file-a

dockerclient/testdata/copyblahblub/firstdir/seconddir/dir-b/file-b

@@ -0,0 +1 @@
+file-b