Fix dockerignore handling of absolute path exceptions.

Signed-off-by: mefyl <[email protected]>

Author: mefyl

docker/utils/build.py

@@ -26,13 +26,13 @@ def exclude_paths(root, patterns, dockerfile=None):
     if dockerfile is None:
         dockerfile = 'Dockerfile'
 
-    patterns = [p.lstrip('/') for p in patterns]
     exceptions = [p for p in patterns if p.startswith('!')]
 
-    include_patterns = [p[1:] for p in exceptions]
+    include_patterns = [p[1:].lstrip('/') for p in exceptions]
     include_patterns += [dockerfile, '.dockerignore']
 
-    exclude_patterns = list(set(patterns) - set(exceptions))
+    exclude_patterns = [
+        p.lstrip('/') for p in list(set(patterns) - set(exceptions))]
 
     paths = get_paths(root, exclude_patterns, include_patterns,
                       has_exceptions=len(exceptions) > 0)

tests/unit/utils_test.py

@@ -758,6 +758,13 @@ def test_single_subdir_single_filename_leading_slash(self):
             self.all_paths - set(['foo/a.py'])
         )
 
+    def test_exclude_include_absolute_path(self):
+        base = make_tree([], ['a.py', 'b.py'])
+        assert exclude_paths(
+            base,
+            ['/*', '!/*.py']
+        ) == set(['a.py', 'b.py'])
+
     def test_single_subdir_with_path_traversal(self):
         assert self.exclude(['foo/whoops/../a.py']) == convert_paths(
             self.all_paths - set(['foo/a.py'])