hack: generate vtproto files for buildx

Integrates vtproto into buildx. The generated files dockerfile has been
modified to copy the buildkit equivalent file to ensure files are laid
out in the appropriate way for imports.

An import has also been included to change the grpc codec to the version
in buildkit that supports vtproto. This will allow buildx to utilize the
speed and memory improvements from that.

Also updates the gc control options for prune.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
This commit is contained in:
Jonathan A. Sternberg
2024-10-08 13:35:06 -05:00
parent d353f5f6ba
commit 64c5139ab6
109 changed files with 68070 additions and 2941 deletions

View File

@ -2,7 +2,7 @@
// versions:
// protoc-gen-go v1.34.1
// protoc v3.11.4
// source: ssh.proto
// source: github.com/moby/buildkit/session/sshforward/ssh.proto
package sshforward
@ -32,7 +32,7 @@ type BytesMessage struct {
func (x *BytesMessage) Reset() {
*x = BytesMessage{}
if protoimpl.UnsafeEnabled {
mi := &file_ssh_proto_msgTypes[0]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -45,7 +45,7 @@ func (x *BytesMessage) String() string {
func (*BytesMessage) ProtoMessage() {}
func (x *BytesMessage) ProtoReflect() protoreflect.Message {
mi := &file_ssh_proto_msgTypes[0]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -58,7 +58,7 @@ func (x *BytesMessage) ProtoReflect() protoreflect.Message {
// Deprecated: Use BytesMessage.ProtoReflect.Descriptor instead.
func (*BytesMessage) Descriptor() ([]byte, []int) {
return file_ssh_proto_rawDescGZIP(), []int{0}
return file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescGZIP(), []int{0}
}
func (x *BytesMessage) GetData() []byte {
@ -79,7 +79,7 @@ type CheckAgentRequest struct {
func (x *CheckAgentRequest) Reset() {
*x = CheckAgentRequest{}
if protoimpl.UnsafeEnabled {
mi := &file_ssh_proto_msgTypes[1]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -92,7 +92,7 @@ func (x *CheckAgentRequest) String() string {
func (*CheckAgentRequest) ProtoMessage() {}
func (x *CheckAgentRequest) ProtoReflect() protoreflect.Message {
mi := &file_ssh_proto_msgTypes[1]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -105,7 +105,7 @@ func (x *CheckAgentRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use CheckAgentRequest.ProtoReflect.Descriptor instead.
func (*CheckAgentRequest) Descriptor() ([]byte, []int) {
return file_ssh_proto_rawDescGZIP(), []int{1}
return file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescGZIP(), []int{1}
}
func (x *CheckAgentRequest) GetID() string {
@ -124,7 +124,7 @@ type CheckAgentResponse struct {
func (x *CheckAgentResponse) Reset() {
*x = CheckAgentResponse{}
if protoimpl.UnsafeEnabled {
mi := &file_ssh_proto_msgTypes[2]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -137,7 +137,7 @@ func (x *CheckAgentResponse) String() string {
func (*CheckAgentResponse) ProtoMessage() {}
func (x *CheckAgentResponse) ProtoReflect() protoreflect.Message {
mi := &file_ssh_proto_msgTypes[2]
mi := &file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -150,57 +150,59 @@ func (x *CheckAgentResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use CheckAgentResponse.ProtoReflect.Descriptor instead.
func (*CheckAgentResponse) Descriptor() ([]byte, []int) {
return file_ssh_proto_rawDescGZIP(), []int{2}
return file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescGZIP(), []int{2}
}
var File_ssh_proto protoreflect.FileDescriptor
var File_github_com_moby_buildkit_session_sshforward_ssh_proto protoreflect.FileDescriptor
var file_ssh_proto_rawDesc = []byte{
0x0a, 0x09, 0x73, 0x73, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x6d, 0x6f, 0x62,
0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x22,
0x22, 0x0a, 0x0c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64,
0x61, 0x74, 0x61, 0x22, 0x23, 0x0a, 0x11, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e,
0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x22, 0x14, 0x0a, 0x12, 0x43, 0x68, 0x65, 0x63,
0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xba,
0x01, 0x0a, 0x03, 0x53, 0x53, 0x48, 0x12, 0x5b, 0x0a, 0x0a, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41,
0x67, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66,
0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41,
0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x6f,
0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31,
0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x0c, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x41, 0x67,
0x65, 0x6e, 0x74, 0x12, 0x20, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f,
0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4d, 0x65,
0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x20, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68,
0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73,
0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x2d, 0x5a, 0x2b, 0x67,
0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x6f, 0x62, 0x79, 0x2f, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x6b, 0x69, 0x74, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2f,
0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
var file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDesc = []byte{
0x0a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x6f, 0x62,
0x79, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x6b, 0x69, 0x74, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69,
0x6f, 0x6e, 0x2f, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2f, 0x73, 0x73,
0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73,
0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x22, 0x22, 0x0a, 0x0c, 0x42,
0x79, 0x74, 0x65, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
0x23, 0x0a, 0x11, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x02, 0x49, 0x44, 0x22, 0x14, 0x0a, 0x12, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65,
0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xba, 0x01, 0x0a, 0x03, 0x53,
0x53, 0x48, 0x12, 0x5b, 0x0a, 0x0a, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74,
0x12, 0x25, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61,
0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74,
0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73,
0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65,
0x63, 0x6b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
0x56, 0x0a, 0x0c, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12,
0x20, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
0x64, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
0x65, 0x1a, 0x20, 0x2e, 0x6d, 0x6f, 0x62, 0x79, 0x2e, 0x73, 0x73, 0x68, 0x66, 0x6f, 0x72, 0x77,
0x61, 0x72, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x4d, 0x65, 0x73, 0x73,
0x61, 0x67, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75,
0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x6f, 0x62, 0x79, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64,
0x6b, 0x69, 0x74, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x73, 0x73, 0x68, 0x66,
0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_ssh_proto_rawDescOnce sync.Once
file_ssh_proto_rawDescData = file_ssh_proto_rawDesc
file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescOnce sync.Once
file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescData = file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDesc
)
func file_ssh_proto_rawDescGZIP() []byte {
file_ssh_proto_rawDescOnce.Do(func() {
file_ssh_proto_rawDescData = protoimpl.X.CompressGZIP(file_ssh_proto_rawDescData)
func file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescGZIP() []byte {
file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescOnce.Do(func() {
file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescData)
})
return file_ssh_proto_rawDescData
return file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDescData
}
var file_ssh_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_ssh_proto_goTypes = []interface{}{
var file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_github_com_moby_buildkit_session_sshforward_ssh_proto_goTypes = []interface{}{
(*BytesMessage)(nil), // 0: moby.sshforward.v1.BytesMessage
(*CheckAgentRequest)(nil), // 1: moby.sshforward.v1.CheckAgentRequest
(*CheckAgentResponse)(nil), // 2: moby.sshforward.v1.CheckAgentResponse
}
var file_ssh_proto_depIdxs = []int32{
var file_github_com_moby_buildkit_session_sshforward_ssh_proto_depIdxs = []int32{
1, // 0: moby.sshforward.v1.SSH.CheckAgent:input_type -> moby.sshforward.v1.CheckAgentRequest
0, // 1: moby.sshforward.v1.SSH.ForwardAgent:input_type -> moby.sshforward.v1.BytesMessage
2, // 2: moby.sshforward.v1.SSH.CheckAgent:output_type -> moby.sshforward.v1.CheckAgentResponse
@ -212,13 +214,13 @@ var file_ssh_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for field type_name
}
func init() { file_ssh_proto_init() }
func file_ssh_proto_init() {
if File_ssh_proto != nil {
func init() { file_github_com_moby_buildkit_session_sshforward_ssh_proto_init() }
func file_github_com_moby_buildkit_session_sshforward_ssh_proto_init() {
if File_github_com_moby_buildkit_session_sshforward_ssh_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_ssh_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BytesMessage); i {
case 0:
return &v.state
@ -230,7 +232,7 @@ func file_ssh_proto_init() {
return nil
}
}
file_ssh_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CheckAgentRequest); i {
case 0:
return &v.state
@ -242,7 +244,7 @@ func file_ssh_proto_init() {
return nil
}
}
file_ssh_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CheckAgentResponse); i {
case 0:
return &v.state
@ -259,18 +261,18 @@ func file_ssh_proto_init() {
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_ssh_proto_rawDesc,
RawDescriptor: file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDesc,
NumEnums: 0,
NumMessages: 3,
NumExtensions: 0,
NumServices: 1,
},
GoTypes: file_ssh_proto_goTypes,
DependencyIndexes: file_ssh_proto_depIdxs,
MessageInfos: file_ssh_proto_msgTypes,
GoTypes: file_github_com_moby_buildkit_session_sshforward_ssh_proto_goTypes,
DependencyIndexes: file_github_com_moby_buildkit_session_sshforward_ssh_proto_depIdxs,
MessageInfos: file_github_com_moby_buildkit_session_sshforward_ssh_proto_msgTypes,
}.Build()
File_ssh_proto = out.File
file_ssh_proto_rawDesc = nil
file_ssh_proto_goTypes = nil
file_ssh_proto_depIdxs = nil
File_github_com_moby_buildkit_session_sshforward_ssh_proto = out.File
file_github_com_moby_buildkit_session_sshforward_ssh_proto_rawDesc = nil
file_github_com_moby_buildkit_session_sshforward_ssh_proto_goTypes = nil
file_github_com_moby_buildkit_session_sshforward_ssh_proto_depIdxs = nil
}