Skip to content

Added GZIP compression for build context creation #284

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 2 commits into from
Jul 30, 2015
Merged

Added GZIP compression for build context creation #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae6027c
Added GZIP compression for build context creation
Jul 28, 2015
d8d3946
use try-with-resource
Jul 30, 2015
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
8 changes: 4 additions & 4 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 @@ -2,9 +2,11 @@

import static com.github.dockerjava.core.FilePathUtil.relativize;

import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.GZIPOutputStream;

import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
Expand All @@ -16,8 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
throws IOException {
File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
tarFile.deleteOnExit();
TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
try {
try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
new BufferedOutputStream(new FileOutputStream(tarFile))))) {
tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
for (File file : files) {
TarArchiveEntry tarEntry = new TarArchiveEntry(file);
Expand All @@ -36,8 +38,6 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
}
tos.closeArchiveEntry();
}
} finally {
tos.close();
}

return tarFile;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ public void onComplete() {

@Override
public void close() throws IOException {
closed = true;
if (stream != null)
stream.close();
completed.countDown();
closed = true;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.GZIPInputStream;

import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
Expand Down Expand Up @@ -43,7 +45,8 @@ private File extractFileByName(File archive, String filenameToExtract) throws IO
expectedFile.delete();
assertThat(expectedFile.exists(), is(false));

TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new GZIPInputStream(
new BufferedInputStream(new FileInputStream(archive))));
TarArchiveEntry entry;
while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
String individualFiles = entry.getName();
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,17 @@ public void testAddAndCopySubstitution() throws Exception {
String response = dockerfileBuild(baseDir);
assertThat(response, containsString("testENVSubstitution successfully completed"));
}

@Test
public void testBuilderPerformance() throws Exception {
File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());

String imageId = buildImage(baseDir);

InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
assertThat(inspectImageResponse, not(nullValue()));
LOG.info("Image Inspect: {}", inspectImageResponse.toString());

assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"[email protected]\""));
}
}