Add support for deleting temporary temp tar files

tedoc2000 · tedoc2000 · commit e57b7faed476 · 2015-01-05T17:52:43.000-08:00
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -120,6 +120,8 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(
 
 	public BuildImageCmd buildImageCmd(File dockerFolder);
 
+	public BuildImageCmd buildImageCmd(File dockerFolder, boolean deleteTarOnExit);
+
 	public BuildImageCmd buildImageCmd(InputStream tarInputStream);
 
 	public TopContainerCmd topContainerCmd(String containerId);
@@ -134,4 +136,4 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(
 
 	public void close() throws IOException;
 
-}
+}
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -8,7 +8,7 @@
 
 public class CompressArchiveUtil {
 
-    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
+    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension, boolean deleteOnExit) throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
         try {
@@ -34,6 +34,9 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             tos.close();
         }
 
+        if (deleteOnExit) {
+            tarFile.deleteOnExit();
+        }
         return tarFile;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -245,7 +245,12 @@ public CommitCmd commitCmd(String containerId) {
 
 	@Override
 	public BuildImageCmd buildImageCmd(File dockerFolder) {
-		return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), dockerFolder);
+		return buildImageCmd(dockerFolder, false);
+	}
+
+	@Override
+	public BuildImageCmd buildImageCmd(File dockerFolder, boolean deleteTarOnExit) {
+		return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), dockerFolder, deleteTarOnExit);
 	}
 
 	@Override
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -45,10 +45,14 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, InputStream
 	private boolean remove = true;
 	private boolean quiet;
 
-	public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFolder) {
+	public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFolder, boolean deleteOnExit) {
 		super(exec);
 		Preconditions.checkNotNull(dockerFolder, "dockerFolder is null");
-		withTarInputStream(buildDockerFolderTar(dockerFolder));
+		withTarInputStream(buildDockerFolderTar(dockerFolder, deleteOnExit));
+	}
+
+	public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFolder) {
+		this(exec, dockerFolder, false);
 	}
 
 	public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
@@ -139,7 +143,7 @@ public String toString() {
 				.toString();
 	}
 
-	protected InputStream buildDockerFolderTar(File dockerFolder) {
+	protected InputStream buildDockerFolderTar(File dockerFolder, boolean deleteOnExit) {
 		Preconditions.checkArgument(dockerFolder.exists(),
 				"Path %s doesn't exist", dockerFolder);
 		Preconditions.checkArgument(dockerFolder.isDirectory(),
@@ -256,7 +260,7 @@ protected InputStream buildDockerFolderTar(File dockerFolder) {
 			}
 
 			dockerFolderTar = CompressArchiveUtil.archiveTARFiles(dockerFolder,
-					filesToAdd, archiveNameWithOutExtension);
+					filesToAdd, archiveNameWithOutExtension, deleteOnExit);
 			return FileUtils.openInputStream(dockerFolderTar);
 		} catch (IOException ex) {
 			FileUtils.deleteQuietly(dockerFolderTar);
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -21,7 +21,7 @@ public class CompressArchiveUtilTest {
   @Test
   public void testExecutableFlagIsPreserved() throws Exception {
     File executableFile = createExecutableFile();
-    File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile), "archive");
+    File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile), "archive", false);
     File expectedFile = extractFileByName(archive, "executableFile.sh.result");
 
     assertThat("should be executable", expectedFile.canExecute());

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`public class CompressArchiveUtil {`
`10`	`10`
`11`		`- public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {`
	`11`	`+ public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension, boolean deleteOnExit) throws IOException {`
`12`	`12`	`File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");`
`13`	`13`	`TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));`
`14`	`14`	`try {`
`@@ -34,6 +34,9 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi`
`34`	`34`	`tos.close();`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ if (deleteOnExit) {`
	`38`	`+ tarFile.deleteOnExit();`
	`39`	`+ }`
`37`	`40`	`return tarFile;`
`38`	`41`	`}`
`39`	`42`