X Tutup
Skip to content

Include empty directories in build context #889

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
KostyaSha merged 1 commit into from
Aug 8, 2017
Merged

Include empty directories in build context #889

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
40 changes: 34 additions & 6 deletions src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;

import com.github.dockerjava.api.exception.DockerClientException;
import com.github.dockerjava.core.GoLangFileMatch;
Expand Down Expand Up @@ -186,16 +185,45 @@ public ScannedResult() throws IOException {
"Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
}

Collection<File> filesInBuildContext = FileUtils.listFiles(baseDirectory, TrueFileFilter.INSTANCE,
TrueFileFilter.INSTANCE);
addFilesInDirectory(baseDirectory);
}

for (File f : filesInBuildContext) {
if (effectiveMatchingIgnorePattern(f) == null) {
filesToAdd.add(f);
/**
* Adds all files found in <code>directory</code> and subdirectories to
* <code>filesToAdd</code> collection. It also adds any empty directories
* if found.
*
* @param directory directory
* @throws DockerClientException when IO error occurs
*/
private void addFilesInDirectory(File directory) {
File[] files = directory.listFiles();

if (files == null) {
throw new DockerClientException("Failed to read build context directory: " + baseDirectory.getAbsolutePath());
}

if (files.length != 0) {
for (File f : files) {
if (effectiveMatchingIgnorePattern(f) == null) {
if (f.isDirectory()) {
addFilesInDirectory(f);
} else {
filesToAdd.add(f);
}
}
}
// base directory should at least contains Dockerfile, but better check
} else if (!isBaseDirectory(directory)) {
// add empty directory
filesToAdd.add(directory);
}
}

private boolean isBaseDirectory(File directory) {
return directory.compareTo(baseDirectory) == 0;
}

/**
* Returns all matching ignore patterns for the given file name.
*/
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ public void ineffectiveIgnorePattern() throws Exception {
@Test
public void addFiles() throws IOException {
File baseDir = fileFromBuildTestResource("ADD/files");
new File(baseDir, "emptydir").mkdir();
Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
Dockerfile.ScannedResult result = dockerfile.parse();
Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);

assertThat(filesToAdd, containsInAnyOrder("Dockerfile", "src1", "src2"));
assertThat(filesToAdd, containsInAnyOrder("emptydir", "Dockerfile", "src1", "src2"));
}

private File fileFromBuildTestResource(String resource) {
Expand Down
X Tutup