From dc460728353a226c217cc6fd29324f570a01993b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= Date: Sun, 13 Aug 2017 22:45:21 +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);