Skip to content

Commit 376e9c8

Browse files
committed
deprecate frontend/dockerfile/dockerignore
This package was moved to github.com/moby/patternmatcher/ignorefile. Mark the alias as deprecated. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent cb63b9c commit 376e9c8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

frontend/dockerfile/dockerignore/dockerignore_deprecated.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
)
88

99
// ReadAll is an alias for [ignorefile.ReadAll].
10+
//
11+
// Deprecated: use [ignorefile.ReadAll] instead.
1012
func ReadAll(reader io.Reader) ([]string, error) {
1113
return ignorefile.ReadAll(reader)
1214
}

frontend/dockerui/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/moby/buildkit/client/llb"
1616
"github.com/moby/buildkit/exporter/containerimage/image"
1717
"github.com/moby/buildkit/frontend/attestations"
18-
"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
1918
"github.com/moby/buildkit/frontend/gateway/client"
2019
"github.com/moby/buildkit/solver/pb"
2120
"github.com/moby/buildkit/util/flightcontrol"
21+
"github.com/moby/patternmatcher/ignorefile"
2222
digest "github.com/opencontainers/go-digest"
2323
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
2424
"github.com/pkg/errors"
@@ -442,7 +442,7 @@ func (bc *Client) MainContext(ctx context.Context, opts ...llb.LocalOption) (*ll
442442

443443
var excludes []string
444444
if len(bc.dockerignore) != 0 {
445-
excludes, err = dockerignore.ReadAll(bytes.NewBuffer(bc.dockerignore))
445+
excludes, err = ignorefile.ReadAll(bytes.NewBuffer(bc.dockerignore))
446446
if err != nil {
447447
return nil, errors.Wrapf(err, "failed parsing %s", bc.dockerignoreName)
448448
}

frontend/dockerui/namedcontext.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/moby/buildkit/client/llb"
1212
"github.com/moby/buildkit/exporter/containerimage/exptypes"
1313
"github.com/moby/buildkit/exporter/containerimage/image"
14-
"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
1514
"github.com/moby/buildkit/frontend/gateway/client"
1615
"github.com/moby/buildkit/util/imageutil"
16+
"github.com/moby/patternmatcher/ignorefile"
1717
"github.com/pkg/errors"
1818
)
1919

@@ -206,7 +206,7 @@ func (bc *Client) namedContextRecursive(ctx context.Context, name string, nameWi
206206
}) // error ignored
207207

208208
if len(dt) != 0 {
209-
excludes, err = dockerignore.ReadAll(bytes.NewBuffer(dt))
209+
excludes, err = ignorefile.ReadAll(bytes.NewBuffer(dt))
210210
if err != nil {
211211
return nil, nil, errors.Wrapf(err, "failed parsing %s", DefaultDockerignoreName)
212212
}

0 commit comments

Comments
 (0)