Skip to content

let CompressArchiveUtil preserve executable flags #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 1 commit into from
Aug 26, 2014
Merged

let CompressArchiveUtil preserve executable flags #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
let CompressArchiveUtil preserve executable flags
  • Loading branch information
@gesellix
gesellix committed Aug 26, 2014
commit 57b7932af7dc245ad62c81a7cdcea9c59ccaabd3
6 changes: 6 additions & 0 deletions src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
59 changes: 59 additions & 0 deletions src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}