mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: update moby/buildkit
Update modules: go mod edit -require github.com/moby/buildkit@master go mod tidy -compat=1.17 && ./hack/update-vendor Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
5
vendor/github.com/moby/buildkit/client/llb/marshal.go
generated
vendored
5
vendor/github.com/moby/buildkit/client/llb/marshal.go
generated
vendored
@ -87,10 +87,7 @@ func MarshalConstraints(base, override *Constraints) (*pb.Op, *pb.OpMetadata) {
|
||||
c.Platform = p
|
||||
}
|
||||
|
||||
for _, wc := range override.WorkerConstraints {
|
||||
c.WorkerConstraints = append(c.WorkerConstraints, wc)
|
||||
}
|
||||
|
||||
c.WorkerConstraints = append(c.WorkerConstraints, override.WorkerConstraints...)
|
||||
c.Metadata = mergeMetadata(c.Metadata, override.Metadata)
|
||||
|
||||
if c.Platform == nil {
|
||||
|
6
vendor/github.com/moby/buildkit/client/llb/resolver.go
generated
vendored
6
vendor/github.com/moby/buildkit/client/llb/resolver.go
generated
vendored
@ -23,6 +23,12 @@ func ResolveDigest(v bool) ImageOption {
|
||||
})
|
||||
}
|
||||
|
||||
func WithLayerLimit(l int) ImageOption {
|
||||
return imageOptionFunc(func(ii *ImageInfo) {
|
||||
ii.layerLimit = &l
|
||||
})
|
||||
}
|
||||
|
||||
// ImageMetaResolver can resolve image config metadata from a reference
|
||||
type ImageMetaResolver interface {
|
||||
ResolveImageConfig(ctx context.Context, ref string, opt ResolveImageConfigOpt) (digest.Digest, []byte, error)
|
||||
|
6
vendor/github.com/moby/buildkit/client/llb/source.go
generated
vendored
6
vendor/github.com/moby/buildkit/client/llb/source.go
generated
vendored
@ -116,6 +116,11 @@ func Image(ref string, opts ...ImageOption) State {
|
||||
attrs[pb.AttrImageRecordType] = info.RecordType
|
||||
}
|
||||
|
||||
if ll := info.layerLimit; ll != nil {
|
||||
attrs[pb.AttrImageLayerLimit] = strconv.FormatInt(int64(*ll), 10)
|
||||
addCap(&info.Constraints, pb.CapSourceImageLayerLimit)
|
||||
}
|
||||
|
||||
src := NewSource("docker-image://"+ref, attrs, info.Constraints) // controversial
|
||||
if err != nil {
|
||||
src.err = err
|
||||
@ -204,6 +209,7 @@ type ImageInfo struct {
|
||||
metaResolver ImageMetaResolver
|
||||
resolveDigest bool
|
||||
resolveMode ResolveMode
|
||||
layerLimit *int
|
||||
RecordType string
|
||||
}
|
||||
|
||||
|
4
vendor/github.com/moby/buildkit/client/llb/state.go
generated
vendored
4
vendor/github.com/moby/buildkit/client/llb/state.go
generated
vendored
@ -619,9 +619,7 @@ var (
|
||||
|
||||
func Require(filters ...string) ConstraintsOpt {
|
||||
return constraintsOptFunc(func(c *Constraints) {
|
||||
for _, f := range filters {
|
||||
c.WorkerConstraints = append(c.WorkerConstraints, f)
|
||||
}
|
||||
c.WorkerConstraints = append(c.WorkerConstraints, filters...)
|
||||
})
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user