alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

vendor: update buildkit to v0.30.0-rc2

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2026-05-11 13:15:00 -07:00
parent 5b40913913
commit cb6566122b
81 changed files with 1037 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/moby/buildkit/api/types/worker.pb.go
Generated Vendored
+17 -8
View File
@@ -192,12 +192,13 @@ func (x *GCPolicy) GetMinFreeSpace() int64 {
}
type BuildkitVersion struct {
state protoimpl.MessageState `protogen:"open.v1"`
Package string `protobuf:"bytes,1,opt,name=package,proto3" json:"package,omitempty"`
Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
Revision string `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
state protoimpl.MessageState `protogen:"open.v1"`
Package string `protobuf:"bytes,1,opt,name=package,proto3" json:"package,omitempty"`
Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
Revision string `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"`
DockerfileVersion string `protobuf:"bytes,4,opt,name=dockerfileVersion,proto3" json:"dockerfileVersion,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *BuildkitVersion) Reset() {
@@ -251,6 +252,13 @@ func (x *BuildkitVersion) GetRevision() string {
return ""
}
func (x *BuildkitVersion) GetDockerfileVersion() string {
if x != nil {
return x.DockerfileVersion
}
return ""
}
type CDIDevice struct {
state protoimpl.MessageState `protogen:"open.v1"`
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -342,11 +350,12 @@ const file_github_com_moby_buildkit_api_types_worker_proto_rawDesc = "" +
"\afilters\x18\x04 \x03(\tR\afilters\x12$\n" +
"\rreservedSpace\x18\x03 \x01(\x03R\rreservedSpace\x12\"\n" +
"\fmaxUsedSpace\x18\x05 \x01(\x03R\fmaxUsedSpace\x12\"\n" +
"\fminFreeSpace\x18\x06 \x01(\x03R\fminFreeSpace\"a\n" +
"\fminFreeSpace\x18\x06 \x01(\x03R\fminFreeSpace\"\x8f\x01\n" +
"\x0fBuildkitVersion\x12\x18\n" +
"\apackage\x18\x01 \x01(\tR\apackage\x12\x18\n" +
"\aversion\x18\x02 \x01(\tR\aversion\x12\x1a\n" +
"\brevision\x18\x03 \x01(\tR\brevision\"\xef\x01\n" +
"\brevision\x18\x03 \x01(\tR\brevision\x12,\n" +
"\x11dockerfileVersion\x18\x04 \x01(\tR\x11dockerfileVersion\"\xef\x01\n" +
"\tCDIDevice\x12\x12\n" +
"\x04Name\x18\x01 \x01(\tR\x04Name\x12\x1c\n" +
"\tAutoAllow\x18\x02 \x01(\bR\tAutoAllow\x12T\n" +
vendor/github.com/moby/buildkit/api/types/worker.proto
Generated Vendored
+2 -1
View File
@@ -30,6 +30,7 @@ message BuildkitVersion {
string package = 1;
string version = 2;
string revision = 3;
string dockerfileVersion = 4;
}
message CDIDevice {
@@ -37,4 +38,4 @@ message CDIDevice {
bool AutoAllow = 2;
map<string, string> Annotations = 3;
bool OnDemand = 4;
}
}
vendor/github.com/moby/buildkit/api/types/worker_vtproto.pb.go
Generated Vendored
+47
View File
@@ -100,6 +100,7 @@ func (m *BuildkitVersion) CloneVT() *BuildkitVersion {
r.Package = m.Package
r.Version = m.Version
r.Revision = m.Revision
r.DockerfileVersion = m.DockerfileVersion
if len(m.unknownFields) > 0 {
r.unknownFields = make([]byte, len(m.unknownFields))
copy(r.unknownFields, m.unknownFields)
@@ -277,6 +278,9 @@ func (this *BuildkitVersion) EqualVT(that *BuildkitVersion) bool {
if this.Revision != that.Revision {
return false
}
if this.DockerfileVersion != that.DockerfileVersion {
return false
}
return string(this.unknownFields) == string(that.unknownFields)
}
@@ -531,6 +535,13 @@ func (m *BuildkitVersion) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
i -= len(m.unknownFields)
copy(dAtA[i:], m.unknownFields)
}
if len(m.DockerfileVersion) > 0 {
i -= len(m.DockerfileVersion)
copy(dAtA[i:], m.DockerfileVersion)
i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.DockerfileVersion)))
i--
dAtA[i] = 0x22
}
if len(m.Revision) > 0 {
i -= len(m.Revision)
copy(dAtA[i:], m.Revision)
@@ -727,6 +738,10 @@ func (m *BuildkitVersion) SizeVT() (n int) {
if l > 0 {
n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
}
l = len(m.DockerfileVersion)
if l > 0 {
n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
}
n += len(m.unknownFields)
return n
}
@@ -1411,6 +1426,38 @@ func (m *BuildkitVersion) UnmarshalVT(dAtA []byte) error {
}
m.Revision = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field DockerfileVersion", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return protohelpers.ErrIntOverflow
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return protohelpers.ErrInvalidLength
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return protohelpers.ErrInvalidLength
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.DockerfileVersion = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := protohelpers.Skip(dAtA[iNdEx:])
vendor/github.com/moby/buildkit/client/info.go
Generated Vendored
+8 -6
View File
@@ -13,9 +13,10 @@ type Info struct {
}
type BuildkitVersion struct {
Package string `json:"package"`
Version string `json:"version"`
Revision string `json:"revision"`
Package string `json:"package"`
Version string `json:"version"`
Revision string `json:"revision"`
DockerfileVersion string `json:"dockerfileVersion,omitempty"`
}
type CDIDevice struct {
@@ -40,9 +41,10 @@ func fromAPIBuildkitVersion(in *apitypes.BuildkitVersion) BuildkitVersion {
return BuildkitVersion{}
}
return BuildkitVersion{
Package: in.Package,
Version: in.Version,
Revision: in.Revision,
Package: in.Package,
Version: in.Version,
Revision: in.Revision,
DockerfileVersion: in.DockerfileVersion,
}
}
vendor/github.com/moby/buildkit/session/group.go
Generated Vendored
+1 -5
View File
@@ -7,10 +7,6 @@ import (
"github.com/pkg/errors"
)
// ErrNoActiveSessions is returned when a session group does not contain any
// active session IDs.
var ErrNoActiveSessions = errors.New("no active sessions")
type Group interface {
SessionIterator() Iterator
}
@@ -73,7 +69,7 @@ func (sm *Manager) Any(ctx context.Context, g Group, f func(context.Context, str
if lastErr != nil {
return lastErr
}
return ErrNoActiveSessions
return errors.Errorf("no active sessions")
}
timeoutCtx, cancel := context.WithCancelCause(ctx)
vendor/github.com/moby/buildkit/solver/llbsolver/provenance/types/types.go
Generated Vendored
+7 -3
View File
@@ -206,8 +206,9 @@ func (c ProvenanceConfigSourceSLSA1) Equal(other ProvenanceConfigSourceSLSA1) bo
}
type ProvenanceInternalParametersSLSA1 struct {
BuildConfig *BuildConfig `json:"buildConfig,omitempty"`
BuilderPlatform string `json:"builderPlatform"`
BuildConfig *BuildConfig `json:"buildConfig,omitempty"`
BuilderPlatform string `json:"builderPlatform"`
DockerfileVersion string `json:"dockerfileVersion,omitempty"`
ProvenanceCustomEnv
}
@@ -338,7 +339,8 @@ func (r *RequestProvenance) Equal(other *RequestProvenance) bool {
}
type Environment struct {
Platform string `json:"platform"`
Platform string `json:"platform"`
DockerfileVersion string `json:"dockerfileVersion,omitempty"`
ProvenanceCustomEnv
}
@@ -402,6 +404,7 @@ func (p *ProvenancePredicateSLSA1) ConvertToSLSA02() *ProvenancePredicateSLSA02
Parameters: p.BuildDefinition.ExternalParameters.Request,
Environment: Environment{
Platform: p.BuildDefinition.InternalParameters.BuilderPlatform,
DockerfileVersion: p.BuildDefinition.InternalParameters.DockerfileVersion,
ProvenanceCustomEnv: p.BuildDefinition.InternalParameters.ProvenanceCustomEnv,
},
},
@@ -436,6 +439,7 @@ func (p *ProvenancePredicateSLSA02) ConvertToSLSA1() *ProvenancePredicateSLSA1 {
InternalParameters: ProvenanceInternalParametersSLSA1{
BuildConfig: p.BuildConfig,
BuilderPlatform: p.Invocation.Environment.Platform,
DockerfileVersion: p.Invocation.Environment.DockerfileVersion,
ProvenanceCustomEnv: p.Invocation.Environment.ProvenanceCustomEnv,
},
}
vendor/github.com/moby/policy-helpers/docker-bake.hcl
Generated Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ variable "ROOT_SIGNING_VERSION" {
type = string
# default = "8842feefbb65effea46ff4a0f2b6aad91e685fe9" # expired root
# default = "9d8b5c5e3bed603c80b57fcc316b7a1af688c57e" # expired timestamp
default = "975f28e3597a34098a7c0c07edc16f47420b9aa3"
default = "e88fa609ddf5a177bb46d0f7c9b43d178b9483a3"
description = "The git commit hash of sigstore/root-signing to use for embedded roots."
}
vendor/github.com/moby/policy-helpers/roots/tuf-root/snapshot.json
Generated Vendored
+4 -4
View File
@@ -2,15 +2,15 @@
"signatures": [
{
"keyid": "0c87432c3bf09fd99189fdc32fa5eaedf4e4a5fac7bab73fa04a2e0fc64af6f5",
"sig": "3046022100a42f44341870864aa7e4f94af642ed68e09890aa109d76947276e24f13c315f2022100c3efb5500a4b67cb03a0fe708db32d8f5f151aad4bbacfd6679437e8c5fa5f9f"
"sig": "30460221009aa4bf5821ae1b692da023df898b93d6f676062b4302d2041c5c262632e6bb72022100ea6d61eb8e9e776881a10ec3d5b036ee0def5f96ca1f1eb778083ed27122e57b"
}
],
"signed": {
"_type": "snapshot",
"expires": "2035-11-24T12:02:06Z",
"expires": "2036-05-04T09:04:05Z",
"meta": {
"registry.npmjs.org.json": {
"version": 7
"version": 8
},
"rekor.json": {
"hashes": {
@@ -49,6 +49,6 @@
}
},
"spec_version": "1.0",
"version": 163
"version": 164
}
}
vendor/github.com/moby/policy-helpers/roots/tuf-root/timestamp.json
Generated Vendored
+4 -4
View File
@@ -2,18 +2,18 @@
"signatures": [
{
"keyid": "0c87432c3bf09fd99189fdc32fa5eaedf4e4a5fac7bab73fa04a2e0fc64af6f5",
"sig": "3046022100a6e78ac794442ab5af6268bc68e66a6fbfc04944ae7feb184a35d28a3ed0a9d40221008f1201dc0924583d74321379a2a0ce709f7401ed69b1bd39ee8c0b8919a782b6"
"sig": "3046022100d90699c23313ac72c6afe8d7cae1b6ce887e59ccb8c2a8ba1206fcce81fe9924022100e7e2b9756673bba280acc90c1b6f30fe04d9a2668515efce004ce603c6b0b040"
}
],
"signed": {
"_type": "timestamp",
"expires": "2026-03-31T13:49:52Z",
"expires": "2026-05-14T09:04:06Z",
"meta": {
"snapshot.json": {
"version": 163
"version": 164
}
},
"spec_version": "1.0",
"version": 628
"version": 668
}
}