Merge pull request #47 from gesellix-docker/compress-archive-executable

marcuslinke · marcuslinke · commit 55d19caa0fc5 · 2014-08-26T23:15:15.000+02:00
let CompressArchiveUtil preserve executable flags
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -17,6 +17,12 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
                 tarEntry.setName(relativize(base, file));
 
+                if (!file.isDirectory()) {
+                    if (file.canExecute()) {
+                        tarEntry.setMode(tarEntry.getMode() | 0755);
+                    }
+                }
+
                 tos.putArchiveEntry(tarEntry);
 
                 if (!file.isDirectory()) {
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.core;
+
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class CompressArchiveUtilTest {
+
+  @Test
+  public void testExecutableFlagIsPreserved() throws Exception {
+    File executableFile = createExecutableFile();
+    File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile), "archive");
+    File expectedFile = extractFileByName(archive, "executableFile.sh.result");
+
+    assertThat("should be executable", expectedFile.canExecute());
+  }
+
+  private File createExecutableFile() throws IOException {
+    File baseDir = new File(FileUtils.getTempDirectoryPath());
+    File executableFile = new File(baseDir, "executableFile.sh");
+    executableFile.createNewFile();
+    executableFile.setExecutable(true);
+    assertThat(executableFile.canExecute(), is(true));
+    return executableFile;
+  }
+
+  private File extractFileByName(File archive, String filenameToExtract) throws IOException {
+    File baseDir = new File(FileUtils.getTempDirectoryPath());
+    File expectedFile = new File(baseDir, filenameToExtract);
+    expectedFile.delete();
+    assertThat(expectedFile.exists(), is(false));
+
+    TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
+    TarArchiveEntry entry;
+    while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
+      String individualFiles = entry.getName();
+      // there should be only one file in this archive
+      assertThat(individualFiles, equalTo("executableFile.sh"));
+      IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
+      if ((entry.getMode() & 0755) == 0755) {
+        expectedFile.setExecutable(true);
+      }
+    }
+    tarArchiveInputStream.close();
+    return expectedFile;
+  }
+}
