From 6d8bb9fbae4f7c19cd358d55f8e628909fc2ff69 Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Wed, 26 Jul 2023 12:06:18 +0100 Subject: [PATCH] frontend/dockerfile/dockerignore: update main context dockerignore error This brings the MainContext dockerignore error inline with the NamedContext dockerignore error, now printing the exact name of the file. Signed-off-by: Justin Chadwell --- frontend/dockerui/config.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/dockerui/config.go b/frontend/dockerui/config.go index 12ec2c6880e0..a83c49940b43 100644 --- a/frontend/dockerui/config.go +++ b/frontend/dockerui/config.go @@ -80,7 +80,8 @@ type Client struct { g flightcontrol.Group[*buildContext] bopts client.BuildOpts - dockerignore []byte + dockerignore []byte + dockerignoreName string } type SBOM struct { @@ -375,6 +376,7 @@ func (bc *Client) ReadEntrypoint(ctx context.Context, lang string, opts ...llb.L }) if err == nil { bc.dockerignore = dt + bc.dockerignoreName = bctx.filename + ".dockerignore" } return &Source{ @@ -435,13 +437,14 @@ func (bc *Client) MainContext(ctx context.Context, opts ...llb.LocalOption) (*ll dt = []byte{} } bc.dockerignore = dt + bc.dockerignoreName = DefaultDockerignoreName } var excludes []string if len(bc.dockerignore) != 0 { excludes, err = dockerignore.ReadAll(bytes.NewBuffer(bc.dockerignore)) if err != nil { - return nil, errors.Wrap(err, "failed to parse dockerignore") + return nil, errors.Wrapf(err, "failed parsing %s", bc.dockerignoreName) } }