replace dockerfile/dockerignore with patternmatcher/ignorefile

The BuildKit dockerignore package was integrated in the patternmatcher repository / module. This patch updates our uses of the BuildKit package with its new location. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah · Aug 22, 2023 · cb63b9c · cb63b9c
1 parent 9f013f4
commit cb63b9c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 55 deletions.
diff --git a/frontend/dockerfile/dockerignore/dockerignore_deprecated.go b/frontend/dockerfile/dockerignore/dockerignore_deprecated.go
@@ -0,0 +1,12 @@
+package dockerignore
+
+import (
+	"io"
+
+	"github.com/moby/patternmatcher/ignorefile"
+)
+
+// ReadAll is an alias for [ignorefile.ReadAll].
+func ReadAll(reader io.Reader) ([]string, error) {
+	return ignorefile.ReadAll(reader)
+}
diff --git a/frontend/dockerfile/dockerignore/dockerignore_test.go b/frontend/dockerfile/dockerignore/dockerignore_test.go
diff --git a/...d/dockerfile/dockerignore/dockerignore.go → ...y/patternmatcher/ignorefile/ignorefile.go b/...d/dockerfile/dockerignore/dockerignore.go → ...y/patternmatcher/ignorefile/ignorefile.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -635,6 +635,7 @@ github.com/moby/locker
 # github.com/moby/patternmatcher v0.6.0
 ## explicit; go 1.19
 github.com/moby/patternmatcher
+github.com/moby/patternmatcher/ignorefile
 # github.com/moby/sys/mount v0.3.3
 ## explicit; go 1.16
 github.com/moby/sys/mount