mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: buildkit, docker/docker and docker/cli v27.0.1
diffs: - https://github.com/docker/cli/compare/v26.1.4..v27.0.1 - https://github.com/docker/docker/compare/v26.1.4..v27.0.1 - https://github.com/moby/buildkit/compare/v0.14.1...aaaf86e5470bffbb395f5c15ad4a1c152642ea30 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
20
vendor/github.com/moby/buildkit/frontend/dockerui/config.go
generated
vendored
20
vendor/github.com/moby/buildkit/frontend/dockerui/config.go
generated
vendored
@ -14,6 +14,7 @@ import (
|
||||
controlapi "github.com/moby/buildkit/api/services/control"
|
||||
"github.com/moby/buildkit/client/llb"
|
||||
"github.com/moby/buildkit/frontend/attestations"
|
||||
"github.com/moby/buildkit/frontend/dockerfile/linter"
|
||||
"github.com/moby/buildkit/frontend/gateway/client"
|
||||
"github.com/moby/buildkit/solver/pb"
|
||||
"github.com/moby/buildkit/util/flightcontrol"
|
||||
@ -65,7 +66,7 @@ type Config struct {
|
||||
ShmSize int64
|
||||
Target string
|
||||
Ulimits []pb.Ulimit
|
||||
LinterConfig *string
|
||||
LinterConfig *linter.Config
|
||||
|
||||
CacheImports []client.CacheOptionsEntry
|
||||
TargetPlatforms []ocispecs.Platform // nil means default
|
||||
@ -78,8 +79,7 @@ type Client struct {
|
||||
Config
|
||||
client client.Client
|
||||
ignoreCache []string
|
||||
bctx *buildContext
|
||||
g flightcontrol.Group[*buildContext]
|
||||
g flightcontrol.CachedGroup[*buildContext]
|
||||
bopts client.BuildOpts
|
||||
|
||||
dockerignore []byte
|
||||
@ -281,21 +281,17 @@ func (bc *Client) init() error {
|
||||
bc.Hostname = opts[keyHostname]
|
||||
|
||||
if v, ok := opts[keyDockerfileLintArg]; ok {
|
||||
bc.LinterConfig = &v
|
||||
bc.LinterConfig, err = linter.ParseLintOptions(v)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to parse %s", keyDockerfileLintArg)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (bc *Client) buildContext(ctx context.Context) (*buildContext, error) {
|
||||
return bc.g.Do(ctx, "initcontext", func(ctx context.Context) (*buildContext, error) {
|
||||
if bc.bctx != nil {
|
||||
return bc.bctx, nil
|
||||
}
|
||||
bctx, err := bc.initContext(ctx)
|
||||
if err == nil {
|
||||
bc.bctx = bctx
|
||||
}
|
||||
return bctx, err
|
||||
return bc.initContext(ctx)
|
||||
})
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user