tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-23 00:32:24 +02:00
parent 2006f3fe7d
commit 5d732010a7
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/watch/dockerignore.go
View File

@ -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)