Change how a tarball is generated when sending a build request. Instead of creating a temporary folder and copying all the files in a flat structure, read the files directly and preserve their path details.

Fixes a problem with adding files in a subfolder like:
Step 2 : ADD files/authorized_keys   /var/lib/jenkins/.ssh/

[Docker] ERROR: {"errorDetail":{"message":"files/authorized_keys: no such file or directory"},"error":"files/authorized_keys: no such file or directory"}

Author: hkampbjorn

src/main/java/com/kpelykh/docker/client/DockerClient.java

@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -805,7 +806,6 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
 		String archiveNameWithOutExtension = UUID.randomUUID().toString();
 
 		File dockerFolderTar = null;
-		File tmpDockerContextFolder = null;
 
 		try {
 			File dockerFile = new File(dockerFolder, "Dockerfile");
@@ -815,10 +815,8 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
 				throw new DockerException(String.format("Dockerfile %s is empty", dockerFile));
 			}
 
-			//Create tmp docker context folder
-			tmpDockerContextFolder = new File(FileUtils.getTempDirectoryPath(), "docker-java-build" + archiveNameWithOutExtension);
-
-			FileUtils.copyFileToDirectory(dockerFile, tmpDockerContextFolder);
+			List<File> filesToAdd = new ArrayList<File>();
+			filesToAdd.add(dockerFile);
 
 			for (String cmd : dockerFileContent) {
 				if (StringUtils.startsWithIgnoreCase(cmd.trim(), "ADD")) {
@@ -833,21 +831,20 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
 					}
 
 					if (!src.exists()) {
-						throw new DockerException(String.format("Source file %s doesnt' exist", src));
+						throw new DockerException(String.format("Source file %s doesn't exist", src));
 					}
 					if (src.isDirectory()) {
-						FileUtils.copyDirectoryToDirectory(src, tmpDockerContextFolder);
+						filesToAdd.addAll(FileUtils.listFiles(src, null, true));
 					} else {
-						FileUtils.copyFileToDirectory(src, tmpDockerContextFolder);
+						filesToAdd.add(src);
 					}
 				}
 			}
 
-			dockerFolderTar = CompressArchiveUtil.archiveTARFiles(tmpDockerContextFolder, archiveNameWithOutExtension);
+			dockerFolderTar = CompressArchiveUtil.archiveTARFiles(dockerFolder, filesToAdd, archiveNameWithOutExtension);
 
 		} catch (IOException ex) {
 			FileUtils.deleteQuietly(dockerFolderTar);
-			FileUtils.deleteQuietly(tmpDockerContextFolder);
 			throw new DockerException("Error occurred while preparing Docker context folder.", ex);
 		}
 
@@ -869,9 +866,6 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
 			throw new DockerException(e);
 		} finally {
 			FileUtils.deleteQuietly(dockerFolderTar);
-			FileUtils.deleteQuietly(tmpDockerContextFolder);
 		}
-
 	}
-
 }

src/main/java/com/kpelykh/docker/client/utils/CompressArchiveUtil.java

@@ -3,57 +3,36 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.RegexFileFilter;
-import org.apache.commons.lang.StringUtils;
 
 import java.io.*;
-import java.util.Collection;
-
-import static org.apache.commons.io.filefilter.FileFilterUtils.*;
 
 public class CompressArchiveUtil {
 
-	public static File archiveTARFiles(File baseDir, String archiveNameWithOutExtension) throws IOException {
-
-		File tarFile = null;
-		
-        tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
-
-        Collection<File> files =
-                FileUtils.listFiles(
-                        baseDir,
-                        new RegexFileFilter("^(.*?)"),
-                        and(directoryFileFilter(), notFileFilter(nameFileFilter(baseDir.getName()))));
-
-        byte[] buf = new byte[1024];
-        int len;
-
-        {
-            TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
+    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
+        File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
+        TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
+        try {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
-                tarEntry.setName(StringUtils.substringAfter(file.toString(), baseDir.getPath()));
+                tarEntry.setName(relativize(base, file));
 
                 tos.putArchiveEntry(tarEntry);
 
                 if (!file.isDirectory()) {
-                    FileInputStream fin = new FileInputStream(file);
-                    BufferedInputStream in = new BufferedInputStream(fin);
-
-                    while ((len = in.read(buf)) != -1) {
-                        tos.write(buf, 0, len);
-                    }
-
-                    in.close();
+                    FileUtils.copyFile(file, tos);
                 }
                 tos.closeArchiveEntry();
-
             }
+        } finally {
             tos.close();
         }
 
-		
-		return tarFile;
-	}
+        return tarFile;
+    }
+
+    private static String relativize(File base, File absolute) {
+        String relative = base.toURI().relativize(absolute.toURI()).getPath();
+        return relative;
+    }
 }

src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java

@@ -40,8 +40,8 @@ public class DockerClientTest extends Assert {
 
 	private DockerClient dockerClient;
 
-	private List<String> tmpImgs = new ArrayList<String>();
-	private List<String> tmpContainers = new ArrayList<String>();
+	private List<String> tmpImgs;
+	private List<String> tmpContainers;
 
 	@BeforeTest
 	public void beforeTest() throws DockerException {
@@ -64,6 +64,8 @@ public void afterTest() {
 
 	@BeforeMethod
 	public void beforeMethod(Method method) {
+	        tmpContainers = new ArrayList<String>();
+	        tmpImgs = new ArrayList<String>();
 		LOG.info(String
 				.format("################################## STARTING %s ##################################",
 						method.getName()));
@@ -663,7 +665,14 @@ public void testDockerBuilderAddFile() throws DockerException, IOException {
 		dockerfileBuild(baseDir, "Successfully executed testrun.sh");
 	}
 
-	@Test
+        @Test
+        public void testDockerBuilderAddFileInSubfolder() throws DockerException, IOException {
+                File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                                .getResource("testAddFileInSubfolder").getFile());
+                dockerfileBuild(baseDir, "Successfully executed testrun.sh");
+        }
+
+        @Test
 	public void testDockerBuilderAddFolder() throws DockerException,
 			IOException {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()

src/test/resources/testAddFileInSubfolder/Dockerfile

@@ -0,0 +1,9 @@
+FROM      ubuntu
+
+# Copy testrun.sh files into the container
+
+ADD ./files/testrun.sh    /tmp/
+
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]

src/test/resources/testAddFileInSubfolder/files/testrun.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Successfully executed testrun.sh"