Merge pull request #3521 from nalind/exclusions

conformance: add more tests for exclusion short-circuiting

tests/conformance/conformance_test.go

@@ -2870,4 +2870,16 @@ var internalTestCases = []testCase{
 		contextDir: "dockerignore/exceptions-skip",
 		fsSkip:     []string{"(dir):volume:mtime"},
 	},
+
+	{
+		name:       "dockerignore-exceptions-weirdness-1",
+		contextDir: "dockerignore/exceptions-weirdness-1",
+		fsSkip:     []string{"(dir):newdir:mtime", "(dir):newdir:(dir):subdir:mtime"},
+	},
+
+	{
+		name:       "dockerignore-exceptions-weirdness-2",
+		contextDir: "dockerignore/exceptions-weirdness-2",
+		fsSkip:     []string{"(dir):newdir:mtime", "(dir):newdir:(dir):subdir:mtime"},
+	},
 }

tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore

@@ -0,0 +1,2 @@
+subdir
+!*/sub1*

tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile

@@ -0,0 +1,2 @@
+FROM alpine
+COPY ./ /newdir

tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore

@@ -0,0 +1,3 @@
+subdir
+!*/sub1*
+!subdir/sub3*

tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile

@@ -0,0 +1,2 @@
+FROM alpine
+COPY ./ /newdir