Skip to content

Fixes copyArchiveToContainerCmdImpl fail when hostResource has an emtty dir which gets added as last entry to tar #574

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
May 9, 2016
Merged

Fixes copyArchiveToContainerCmdImpl fail when hostResource has an emtty dir which gets added as last entry to tar #574

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
9641b01
Fixes copyArchiveToContainerCmdImpl fail when hostResource has an emp…
denlap007 May 8, 2016
d2b2a2d
Added Test Case that simulates failure on copyArchiveToContainerCmdIm…
denlap007 May 9, 2016
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
1 change: 1 addition & 0 deletions src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
if (!dir.equals(basePath)) {
tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(FilePathUtil.relativize(basePath, dir)));
tarArchiveOutputStream.closeArchiveEntry();
}
return FileVisitResult.CONTINUE;
}
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,32 @@ public void copyToNonExistingContainer() throws Exception {
} catch (NotFoundException ignored) {
}
}

@Test
public void copyDirWithLastAddedTarEnryEmptyDir() throws Exception{
// create a temp dir
Path localDir = Files.createTempDirectory("");
localDir.toFile().deleteOnExit();
// create sub-dir with name b
Path emptyDir = Files.createTempDirectory(localDir.resolve("b"), "");
emptyDir.toFile().deleteOnExit();
// creaet sub-dir with name a
Path dirWithFile = Files.createTempDirectory(localDir.resolve("a"), "");
dirWithFile.toFile().deleteOnExit();
// create file in sub-dir b, name or conter are irrelevant
Path file = Files.createTempFile(dirWithFile.resolve("file"), "", "");
file.toFile().deleteOnExit();

// create a test container
CreateContainerResponse container = dockerClient.createContainerCmd("progrium/busybox:latest")
.withCmd("/bin/sh", "-c", "while true; do sleep 9999; done")
.exec();
// start the container
dockerClient.startContainerCmd(container.getId()).exec();
// copy data from local dir to container
dockerClient.copyArchiveToContainerCmd(container.getId())
.withHostResource(localDir.toString())
.exec();
}

}