fix GoLangMatchFileFilter

Marcus Linke · Marcus Linke · commit 39130d3f6ffe · 2014-11-17T21:53:49.000+01:00
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -10,17 +10,23 @@
 
 public class GoLangMatchFileFilter extends AbstractFileFilter {
 
+	private final File base;
+	
     private final List<String> patterns;
 
 
-    public GoLangMatchFileFilter(List<String> patterns) {
+    public GoLangMatchFileFilter(File base, List<String> patterns) {
         super();
+        this.base = base;
         this.patterns = patterns;
     }
 
     @Override
     public boolean accept(File file) {
-        return !GoLangFileMatch.match(patterns, file);
+    	String relativePath = file.getAbsolutePath().replaceFirst(base.getAbsolutePath() + File.separatorChar, "");
+    	
+    	boolean match = GoLangFileMatch.match(patterns, relativePath);
+        return !match;
     }
 
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -6,6 +6,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,8 +30,6 @@
  * 
  * Build an image from Dockerfile.
  * 
- * TODO: http://docs.docker.com/reference/builder/#dockerignore
- * 
  */
 public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, InputStream> implements BuildImageCmd {
 
@@ -243,8 +242,9 @@ protected InputStream buildDockerFolderTar(File dockerFolder) {
 									"Source file %s doesn't exist", src));
 						}
 						if (src.isDirectory()) {
-							filesToAdd.addAll(FileUtils.listFiles(src,
-									new GoLangMatchFileFilter(ignores), TrueFileFilter.INSTANCE));
+							Collection<File> files = FileUtils.listFiles(src,
+									new GoLangMatchFileFilter(src, ignores), TrueFileFilter.INSTANCE);
+							filesToAdd.addAll(files);
 						} else if (!GoLangFileMatch.match(ignores, CompressArchiveUtil.relativize(dockerFolder, src))){
 							filesToAdd.add(src);
 						} else {
diff --git a/src/test/resources/testDockerignore/.dockerignore b/src/test/resources/testDockerignore/.dockerignore
@@ -1 +1 @@
-b
+b
