Skip to content

Fix to Issue #219 #223

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

Closed
hkuyam007 wants to merge 1 commit into from
Closed

Fix to Issue #219 #223

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
87 changes: 22 additions & 65 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 @@ -169,75 +169,32 @@ public ScannedResult() throws IOException {
ignores = getIgnores();
filesToAdd.add(dockerFile);

for (DockerfileStatement statement : getStatements()) {
if (statement instanceof DockerfileStatement.Env) {
processEnvStatement((DockerfileStatement.Env) statement);
} else if (statement instanceof DockerfileStatement.Add) {
processAddStatement((DockerfileStatement.Add) statement);
}
}
}

private void processAddStatement(DockerfileStatement.Add add) throws IOException {

add = add.transform(environmentMap);

if (add.isFileResource()) {

File dockerFolder = getDockerFolder();
String resource = add.source;

File src = new File(resource);
if (!src.isAbsolute()) {
src = new File(dockerFolder, resource);
} else {
throw new DockerClientException(String.format(
"Source file %s must be relative to %s",
src, dockerFolder));
}
addAllFilesToContext(dockerFile.getParentFile());

if (src.exists()) {
src = src.getCanonicalFile();
if (src.isDirectory()) {
Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores), TrueFileFilter.INSTANCE);
filesToAdd.addAll(files);
} else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
filesToAdd.add(src);
} else {
throw new DockerClientException(String.format("Source file %s is excluded by .dockerignore file", src));
}
} else {
filesToAdd.addAll(resolveWildcards(src, ignores));
}
}
}

private Collection<File> resolveWildcards(File file, List<String> ignores) {
List<File> filesToAdd = new ArrayList<File>();

File parent = file.getParentFile();
if (parent != null) {
if (parent.isDirectory()) {
Collection<File> files = FileUtils.listFiles(parent,
new GoLangMatchFileFilter(parent, ignores),
TrueFileFilter.INSTANCE);
filesToAdd.addAll(files);
} else {
filesToAdd.addAll(resolveWildcards(parent, ignores));
}
} else {
throw new DockerClientException(String.format(
"Source file %s doesn't exist", file));
}

return filesToAdd;
private void addAllFilesToContext(File dockerContextFolder) {

File[] files = dockerContextFolder.listFiles();

if(files != null && files.length > 0) {

for(File file : files) {

filesToAdd.add(file);

if(file.isDirectory()) {

addAllFilesToContext(file);

}

}

}

}

private void processEnvStatement(DockerfileStatement.Env env) {

environmentMap.put(env.variable, env.value);
}


}

}