diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go index f3ac3b14e0..e9312abfe4 100644 --- a/tests/conformance/conformance_test.go +++ b/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"}, + }, } diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore new file mode 100644 index 0000000000..aeebb19c63 --- /dev/null +++ b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore @@ -0,0 +1,2 @@ +subdir +!*/sub1* diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile new file mode 100644 index 0000000000..732754d567 --- /dev/null +++ b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile @@ -0,0 +1,2 @@ +FROM alpine +COPY ./ /newdir diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub1.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub1.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub2.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub2.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub3.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub3.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore new file mode 100644 index 0000000000..9dfeea2ddb --- /dev/null +++ b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore @@ -0,0 +1,3 @@ +subdir +!*/sub1* +!subdir/sub3* diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile new file mode 100644 index 0000000000..732754d567 --- /dev/null +++ b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile @@ -0,0 +1,2 @@ +FROM alpine +COPY ./ /newdir diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub1.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub1.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub2.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub2.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub3.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub3.txt new file mode 100644 index 0000000000..e69de29bb2