Skip to content

Use RegEx to match ADD command from Dockerfile. #14

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
docker-java merged 2 commits into from
Jul 2, 2014
Merged

Use RegEx to match ADD command from Dockerfile. #14

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cfc7f3
Use regular expression to match on ADD command.
jdpgrailsdev Jul 2, 2014
d71d968
Added .trim() to command string.
jdpgrailsdev Jul 2, 2014
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
Prev Previous commit
Added .trim() to command string.
  • Loading branch information
@jdpgrailsdev
jdpgrailsdev committed Jul 2, 2014
commit d71d9681c700c1964e5d71d1805c9f68125ae8f3
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/client/command/BuildImgCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected File buildDockerFolderTar() {
filesToAdd.add(dockerFile);

for (String cmd : dockerFileContent) {
final Matcher matcher = ADD_PATTERN.matcher(cmd);
final Matcher matcher = ADD_PATTERN.matcher(cmd.trim());
if (matcher.find()) {
if (matcher.groupCount() != 2) {
throw new DockerException(String.format("Wrong format on line [%s]", cmd));
Expand Down