From 3cd85edf9fc87d897fad5befffc13662cf65c39d Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 9 Aug 2017 00:57:36 +0200 Subject: [PATCH] Fix .dockerignore handling on Windows --- .../java/com/github/dockerjava/core/dockerfile/Dockerfile.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java index 848ae691e..c9931efbd 100644 --- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java +++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java @@ -252,7 +252,8 @@ private List matchingIgnorePatterns(String fileName) { * will be respected. */ private String effectiveMatchingIgnorePattern(File file) { - String relativeFilename = FilePathUtil.relativize(baseDirectory, file); + // normalize path to replace '/' to '\' on Windows + String relativeFilename = FilenameUtils.normalize(FilePathUtil.relativize(baseDirectory, file)); List matchingPattern = matchingIgnorePatterns(relativeFilename);