From 5d732010a754286c1f0af0a89ff9614f3f967827 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 23 Aug 2023 00:32:24 +0200 Subject: [PATCH] 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. A small local change was made to keep the format of the existing error message, because the "ignorefile" package is slightly more agnostic in that respect and doesn't include ".dockerignore" in the error message. Signed-off-by: Sebastiaan van Stijn --- pkg/watch/dockerignore.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/watch/dockerignore.go b/pkg/watch/dockerignore.go index e036883ab..35c18499b 100644 --- a/pkg/watch/dockerignore.go +++ b/pkg/watch/dockerignore.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" - "github.com/moby/buildkit/frontend/dockerfile/dockerignore" "github.com/moby/patternmatcher" + "github.com/moby/patternmatcher/ignorefile" ) type dockerPathMatcher struct { @@ -133,13 +133,17 @@ func readDockerignorePatterns(repoRoot string) ([]string, error) { } defer func() { _ = f.Close() }() - return dockerignore.ReadAll(f) + patterns, err := ignorefile.ReadAll(f) + if err != nil { + return nil, fmt.Errorf("error reading .dockerignore: %w", err) + } + return patterns, nil } func DockerIgnoreTesterFromContents(repoRoot string, contents string) (*dockerPathMatcher, error) { - patterns, err := dockerignore.ReadAll(strings.NewReader(contents)) + patterns, err := ignorefile.ReadAll(strings.NewReader(contents)) if err != nil { - return nil, err + return nil, fmt.Errorf("error reading .dockerignore: %w", err) } return NewDockerPatternMatcher(repoRoot, patterns)