docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-09 21:17:09 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

vendor: update buildkit to master@c36941f4a10e

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell
2023-05-30 09:10:52 +01:00
parent 17bdbbd3c3
commit 6c62225d1b
141 changed files with 1402 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/moby/buildkit/client/llb/definition.go generated vendored
View File

@ -70,7 +70,7 @@ func NewDefinitionOp(def *pb.Definition) (*DefinitionOp, error) {
state := NewState(op)
st = &state
}
sourceMaps[i] = NewSourceMap(st, info.Filename, info.Data)
sourceMaps[i] = NewSourceMap(st, info.Filename, info.Language, info.Data)
}
for dgst, locs := range def.Source.Locations {

2
vendor/github.com/moby/buildkit/client/llb/diff.go generated vendored
View File

@ -106,5 +106,5 @@ func Diff(lower, upper State, opts ...ConstraintsOpt) State {
for _, o := range opts {
o.SetConstraintsOption(&c)
}
return NewState(NewDiff(lower, upper, c).Output())
return lower.WithOutput(NewDiff(lower, upper, c).Output())
}

1
vendor/github.com/moby/buildkit/client/llb/fileop.go generated vendored
View File

@ -724,6 +724,7 @@ func (f *FileOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []
}
pop, md := MarshalConstraints(c, &f.constraints)
pop.Platform = nil // file op is not platform specific
pop.Op = &pb.Op_File{
File: pfo,
}

2
vendor/github.com/moby/buildkit/client/llb/merge.go generated vendored
View File

@ -117,5 +117,5 @@ func Merge(inputs []State, opts ...ConstraintsOpt) State {
o.SetConstraintsOption(&c)
}
addCap(&c, pb.CapMergeOp)
return NewState(NewMerge(filteredInputs, c).Output())
return filteredInputs[0].WithOutput(NewMerge(filteredInputs, c).Output())
}

8
vendor/github.com/moby/buildkit/client/llb/sourcemap.go generated vendored
View File

@ -21,13 +21,16 @@ type SourceMap struct {
State *State
Definition *Definition
Filename string
Data []byte
// Language should use names defined in https://github.com/github/linguist/blob/v7.24.1/lib/linguist/languages.yml
Language string
Data []byte
}
func NewSourceMap(st *State, filename string, dt []byte) *SourceMap {
func NewSourceMap(st *State, filename string, lang string, dt []byte) *SourceMap {
return &SourceMap{
State: st,
Filename: filename,
Language: lang,
Data: dt,
}
}
@ -92,6 +95,7 @@ func (smc *sourceMapCollector) Marshal(ctx context.Context, co ...ConstraintsOpt
info := &pb.SourceInfo{
Data: m.Data,
Filename: m.Filename,
Language: m.Language,
}
if def != nil {