control: allow setting cache export mode
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>docker-18.09
Tonis Tiigi
parent
335b1c3660
commit
57693f3c64
|
|
@ -249,8 +249,9 @@ func (m *SolveRequest) GetCache() CacheOptions {
|
|||
}
|
||||
|
||||
type CacheOptions struct {
|
||||
ExportRef string `protobuf:"bytes,1,opt,name=ExportRef,proto3" json:"ExportRef,omitempty"`
|
||||
ImportRefs []string `protobuf:"bytes,2,rep,name=ImportRefs" json:"ImportRefs,omitempty"`
|
||||
ExportRef string `protobuf:"bytes,1,opt,name=ExportRef,proto3" json:"ExportRef,omitempty"`
|
||||
ImportRefs []string `protobuf:"bytes,2,rep,name=ImportRefs" json:"ImportRefs,omitempty"`
|
||||
ExportAttrs map[string]string `protobuf:"bytes,3,rep,name=ExportAttrs" json:"ExportAttrs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
|
||||
}
|
||||
|
||||
func (m *CacheOptions) Reset() { *m = CacheOptions{} }
|
||||
|
|
@ -272,6 +273,13 @@ func (m *CacheOptions) GetImportRefs() []string {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *CacheOptions) GetExportAttrs() map[string]string {
|
||||
if m != nil {
|
||||
return m.ExportAttrs
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type SolveResponse struct {
|
||||
ExporterResponse map[string]string `protobuf:"bytes,1,rep,name=ExporterResponse" json:"ExporterResponse,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
|
||||
}
|
||||
|
|
@ -1186,6 +1194,23 @@ func (m *CacheOptions) MarshalTo(dAtA []byte) (int, error) {
|
|||
i += copy(dAtA[i:], s)
|
||||
}
|
||||
}
|
||||
if len(m.ExportAttrs) > 0 {
|
||||
for k, _ := range m.ExportAttrs {
|
||||
dAtA[i] = 0x1a
|
||||
i++
|
||||
v := m.ExportAttrs[k]
|
||||
mapSize := 1 + len(k) + sovControl(uint64(len(k))) + 1 + len(v) + sovControl(uint64(len(v)))
|
||||
i = encodeVarintControl(dAtA, i, uint64(mapSize))
|
||||
dAtA[i] = 0xa
|
||||
i++
|
||||
i = encodeVarintControl(dAtA, i, uint64(len(k)))
|
||||
i += copy(dAtA[i:], k)
|
||||
dAtA[i] = 0x12
|
||||
i++
|
||||
i = encodeVarintControl(dAtA, i, uint64(len(v)))
|
||||
i += copy(dAtA[i:], v)
|
||||
}
|
||||
}
|
||||
return i, nil
|
||||
}
|
||||
|
||||
|
|
@ -1758,6 +1783,14 @@ func (m *CacheOptions) Size() (n int) {
|
|||
n += 1 + l + sovControl(uint64(l))
|
||||
}
|
||||
}
|
||||
if len(m.ExportAttrs) > 0 {
|
||||
for k, v := range m.ExportAttrs {
|
||||
_ = k
|
||||
_ = v
|
||||
mapEntrySize := 1 + len(k) + sovControl(uint64(len(k))) + 1 + len(v) + sovControl(uint64(len(v)))
|
||||
n += mapEntrySize + 1 + sovControl(uint64(mapEntrySize))
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
|
|
@ -3002,6 +3035,124 @@ func (m *CacheOptions) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
m.ImportRefs = append(m.ImportRefs, string(dAtA[iNdEx:postIndex]))
|
||||
iNdEx = postIndex
|
||||
case 3:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field ExportAttrs", wireType)
|
||||
}
|
||||
var msglen int
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowControl
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
msglen |= (int(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
if msglen < 0 {
|
||||
return ErrInvalidLengthControl
|
||||
}
|
||||
postIndex := iNdEx + msglen
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
if m.ExportAttrs == nil {
|
||||
m.ExportAttrs = make(map[string]string)
|
||||
}
|
||||
var mapkey string
|
||||
var mapvalue string
|
||||
for iNdEx < postIndex {
|
||||
entryPreIndex := iNdEx
|
||||
var wire uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowControl
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
wire |= (uint64(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
fieldNum := int32(wire >> 3)
|
||||
if fieldNum == 1 {
|
||||
var stringLenmapkey uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowControl
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
stringLenmapkey |= (uint64(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
intStringLenmapkey := int(stringLenmapkey)
|
||||
if intStringLenmapkey < 0 {
|
||||
return ErrInvalidLengthControl
|
||||
}
|
||||
postStringIndexmapkey := iNdEx + intStringLenmapkey
|
||||
if postStringIndexmapkey > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
|
||||
iNdEx = postStringIndexmapkey
|
||||
} else if fieldNum == 2 {
|
||||
var stringLenmapvalue uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowControl
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
stringLenmapvalue |= (uint64(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
intStringLenmapvalue := int(stringLenmapvalue)
|
||||
if intStringLenmapvalue < 0 {
|
||||
return ErrInvalidLengthControl
|
||||
}
|
||||
postStringIndexmapvalue := iNdEx + intStringLenmapvalue
|
||||
if postStringIndexmapvalue > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
|
||||
iNdEx = postStringIndexmapvalue
|
||||
} else {
|
||||
iNdEx = entryPreIndex
|
||||
skippy, err := skipControl(dAtA[iNdEx:])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if skippy < 0 {
|
||||
return ErrInvalidLengthControl
|
||||
}
|
||||
if (iNdEx + skippy) > postIndex {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
iNdEx += skippy
|
||||
}
|
||||
}
|
||||
m.ExportAttrs[mapkey] = mapvalue
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipControl(dAtA[iNdEx:])
|
||||
|
|
@ -4641,78 +4792,80 @@ var (
|
|||
func init() { proto.RegisterFile("control.proto", fileDescriptorControl) }
|
||||
|
||||
var fileDescriptorControl = []byte{
|
||||
// 1167 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0x23, 0x45,
|
||||
0x13, 0x7e, 0xc7, 0x76, 0xfc, 0x51, 0x76, 0xa2, 0xbc, 0x0d, 0xac, 0x46, 0x03, 0x24, 0x66, 0x00,
|
||||
0xc9, 0x5a, 0xed, 0x8e, 0x77, 0x03, 0x8b, 0x20, 0x07, 0xb4, 0xeb, 0x78, 0x11, 0x89, 0x12, 0xb1,
|
||||
0xea, 0x6c, 0x58, 0x89, 0xdb, 0xd8, 0xee, 0x78, 0x47, 0x19, 0x4f, 0x0f, 0xdd, 0x3d, 0xd1, 0x86,
|
||||
0x5f, 0xc1, 0x81, 0x2b, 0xbf, 0x82, 0x03, 0x67, 0x0e, 0x48, 0x7b, 0xe4, 0xcc, 0x21, 0xa0, 0xdc,
|
||||
0xe1, 0x37, 0xa0, 0xfe, 0x18, 0xbb, 0x9d, 0x71, 0x3e, 0xf7, 0xe4, 0xae, 0xf2, 0x53, 0xcf, 0x54,
|
||||
0x57, 0x55, 0x57, 0x15, 0x2c, 0x0f, 0x69, 0x22, 0x18, 0x8d, 0x83, 0x94, 0x51, 0x41, 0xd1, 0xea,
|
||||
0x84, 0x0e, 0x4e, 0x82, 0x41, 0x16, 0xc5, 0xa3, 0xa3, 0x48, 0x04, 0xc7, 0x0f, 0xbd, 0xfb, 0xe3,
|
||||
0x48, 0xbc, 0xcc, 0x06, 0xc1, 0x90, 0x4e, 0xba, 0x63, 0x3a, 0xa6, 0x5d, 0x05, 0x1c, 0x64, 0x87,
|
||||
0x4a, 0x52, 0x82, 0x3a, 0x69, 0x02, 0x6f, 0x7d, 0x4c, 0xe9, 0x38, 0x26, 0x33, 0x94, 0x88, 0x26,
|
||||
0x84, 0x8b, 0x70, 0x92, 0x1a, 0xc0, 0x3d, 0x8b, 0x4f, 0x7e, 0xac, 0x9b, 0x7f, 0xac, 0xcb, 0x69,
|
||||
0x7c, 0x4c, 0x58, 0x37, 0x1d, 0x74, 0x69, 0xca, 0x35, 0xda, 0x5f, 0x81, 0xd6, 0x33, 0x96, 0x25,
|
||||
0x04, 0x93, 0xef, 0x33, 0xc2, 0x85, 0x7f, 0x17, 0x56, 0xfb, 0x11, 0x3f, 0x3a, 0xe0, 0xe1, 0x38,
|
||||
0xd7, 0xa1, 0x3b, 0x50, 0x3d, 0x8c, 0x62, 0x41, 0x98, 0xeb, 0xb4, 0x9d, 0x4e, 0x03, 0x1b, 0xc9,
|
||||
0xdf, 0x81, 0xff, 0x5b, 0x58, 0x9e, 0xd2, 0x84, 0x13, 0xf4, 0x08, 0xaa, 0x8c, 0x0c, 0x29, 0x1b,
|
||||
0xb9, 0x4e, 0xbb, 0xdc, 0x69, 0x6e, 0xbc, 0x1f, 0x9c, 0xbf, 0x71, 0x60, 0x0c, 0x24, 0x08, 0x1b,
|
||||
0xb0, 0xff, 0x5b, 0x09, 0x9a, 0x96, 0x1e, 0xad, 0x40, 0x69, 0xbb, 0x6f, 0xbe, 0x57, 0xda, 0xee,
|
||||
0x23, 0x17, 0x6a, 0x7b, 0x99, 0x08, 0x07, 0x31, 0x71, 0x4b, 0x6d, 0xa7, 0x53, 0xc7, 0xb9, 0x88,
|
||||
0xde, 0x86, 0xa5, 0xed, 0xe4, 0x80, 0x13, 0xb7, 0xac, 0xf4, 0x5a, 0x40, 0x08, 0x2a, 0xfb, 0xd1,
|
||||
0x0f, 0xc4, 0xad, 0xb4, 0x9d, 0x4e, 0x19, 0xab, 0xb3, 0xbc, 0xc7, 0xb3, 0x90, 0x91, 0x44, 0xb8,
|
||||
0x4b, 0xfa, 0x1e, 0x5a, 0x42, 0x3d, 0x68, 0x6c, 0x31, 0x12, 0x0a, 0x32, 0x7a, 0x22, 0xdc, 0x6a,
|
||||
0xdb, 0xe9, 0x34, 0x37, 0xbc, 0x40, 0x87, 0x39, 0xc8, 0xc3, 0x1c, 0x3c, 0xcf, 0xc3, 0xdc, 0xab,
|
||||
0xbf, 0x3e, 0x5d, 0xff, 0xdf, 0x8f, 0x7f, 0xad, 0x3b, 0x78, 0x66, 0x86, 0x1e, 0x03, 0xec, 0x86,
|
||||
0x5c, 0x1c, 0x70, 0x45, 0x52, 0xbb, 0x92, 0xa4, 0xa2, 0x08, 0x2c, 0x1b, 0xb4, 0x06, 0xa0, 0x02,
|
||||
0xb0, 0x45, 0xb3, 0x44, 0xb8, 0x75, 0xe5, 0xb7, 0xa5, 0x41, 0x6d, 0x68, 0xf6, 0x09, 0x1f, 0xb2,
|
||||
0x28, 0x15, 0x11, 0x4d, 0xdc, 0x86, 0xba, 0x82, 0xad, 0xf2, 0x7f, 0xaa, 0x40, 0x6b, 0x5f, 0xe6,
|
||||
0x38, 0x4f, 0xdc, 0x2a, 0x94, 0x31, 0x39, 0x34, 0x51, 0x94, 0x47, 0x14, 0x00, 0xf4, 0xc9, 0x61,
|
||||
0x94, 0x44, 0x8a, 0xa3, 0xa4, 0xdc, 0x5c, 0x09, 0xd2, 0x41, 0x30, 0xd3, 0x62, 0x0b, 0x81, 0x3c,
|
||||
0xa8, 0x3f, 0x7d, 0x95, 0x52, 0x26, 0x93, 0x5f, 0x56, 0x34, 0x53, 0x19, 0xbd, 0x80, 0xe5, 0xfc,
|
||||
0xfc, 0x44, 0x08, 0xc6, 0xdd, 0x8a, 0x4a, 0xf8, 0xc3, 0x62, 0xc2, 0x6d, 0xa7, 0x82, 0x39, 0x9b,
|
||||
0xa7, 0x89, 0x60, 0x27, 0x78, 0x9e, 0x47, 0xe6, 0x7a, 0x9f, 0x70, 0x2e, 0x3d, 0xd4, 0x89, 0xca,
|
||||
0x45, 0xe9, 0xce, 0x57, 0x8c, 0x26, 0x82, 0x24, 0x23, 0x95, 0xa8, 0x06, 0x9e, 0xca, 0xd2, 0x9d,
|
||||
0xfc, 0xac, 0xdd, 0xa9, 0x5d, 0xcb, 0x9d, 0x39, 0x1b, 0xe3, 0xce, 0x9c, 0x0e, 0x6d, 0xc2, 0xd2,
|
||||
0x56, 0x38, 0x7c, 0x49, 0x54, 0x4e, 0x9a, 0x1b, 0x6b, 0x45, 0x42, 0xf5, 0xf7, 0x37, 0x2a, 0x09,
|
||||
0xbc, 0x57, 0x91, 0xe5, 0x81, 0xb5, 0x89, 0xf7, 0x18, 0x50, 0xf1, 0xbe, 0x32, 0x2f, 0x47, 0xe4,
|
||||
0x24, 0xcf, 0xcb, 0x11, 0x39, 0x91, 0x45, 0x7c, 0x1c, 0xc6, 0x99, 0x2e, 0xee, 0x06, 0xd6, 0xc2,
|
||||
0x66, 0xe9, 0x73, 0x47, 0x32, 0x14, 0x5d, 0xbc, 0x09, 0x83, 0xbf, 0x0b, 0x2d, 0xdb, 0x41, 0xf4,
|
||||
0x1e, 0x34, 0xb4, 0x4f, 0xb3, 0xda, 0x98, 0x29, 0x64, 0x19, 0x6e, 0x4f, 0x8c, 0xc0, 0xdd, 0x52,
|
||||
0xbb, 0xdc, 0x69, 0x60, 0x4b, 0xe3, 0xff, 0xea, 0xc0, 0xb2, 0x09, 0xa0, 0x79, 0xf1, 0x21, 0xac,
|
||||
0xe6, 0x77, 0xcc, 0x75, 0xe6, 0xed, 0x3f, 0xba, 0x30, 0xf6, 0x1a, 0x16, 0x9c, 0xb7, 0xd3, 0xf1,
|
||||
0x2f, 0xd0, 0x79, 0x5b, 0xf0, 0xce, 0x42, 0xe8, 0x8d, 0xe2, 0xf0, 0x01, 0x2c, 0xef, 0x8b, 0x50,
|
||||
0x64, 0xfc, 0xc2, 0xe7, 0xe1, 0xff, 0xe2, 0xc0, 0x4a, 0x8e, 0x31, 0xb7, 0xfb, 0x14, 0xea, 0xc7,
|
||||
0x84, 0x09, 0xf2, 0x8a, 0x70, 0x73, 0x2b, 0xb7, 0x78, 0xab, 0x6f, 0x15, 0x02, 0x4f, 0x91, 0x68,
|
||||
0x13, 0xea, 0x5c, 0xf1, 0x10, 0x1d, 0xc3, 0x85, 0x65, 0xa3, 0xad, 0xcc, 0xf7, 0xa6, 0x78, 0xd4,
|
||||
0x85, 0x4a, 0x4c, 0xc7, 0xdc, 0x2d, 0x2b, 0xbb, 0x77, 0x2f, 0xb2, 0xdb, 0xa5, 0x63, 0xac, 0x80,
|
||||
0xfe, 0x69, 0x09, 0xaa, 0x5a, 0x87, 0x76, 0xa0, 0x3a, 0x8a, 0xc6, 0x84, 0x0b, 0x7d, 0xab, 0xde,
|
||||
0x86, 0x2c, 0xc6, 0x3f, 0x4f, 0xd7, 0xef, 0x5a, 0x43, 0x81, 0xa6, 0x24, 0x91, 0x43, 0x29, 0x8c,
|
||||
0x12, 0xc2, 0x78, 0x77, 0x4c, 0xef, 0x6b, 0x93, 0xa0, 0xaf, 0x7e, 0xb0, 0x61, 0x90, 0x5c, 0x51,
|
||||
0x92, 0x66, 0xc2, 0x54, 0xc1, 0xed, 0xb8, 0x34, 0x83, 0x6c, 0xc7, 0x49, 0x38, 0x21, 0xa6, 0x87,
|
||||
0xa8, 0xb3, 0x6c, 0xc7, 0x43, 0x59, 0x97, 0x23, 0xd5, 0xa4, 0xeb, 0xd8, 0x48, 0x68, 0x13, 0x6a,
|
||||
0x5c, 0x84, 0x4c, 0x90, 0x91, 0x7a, 0xfe, 0xd7, 0xe9, 0xa3, 0xb9, 0x01, 0xfa, 0x12, 0x1a, 0x43,
|
||||
0x3a, 0x49, 0x63, 0x22, 0xad, 0xab, 0xd7, 0xb4, 0x9e, 0x99, 0xc8, 0xea, 0x21, 0x8c, 0x51, 0xa6,
|
||||
0x3a, 0x78, 0x03, 0x6b, 0xc1, 0xff, 0xb7, 0x04, 0x2d, 0x3b, 0x59, 0x85, 0xe9, 0xb4, 0x03, 0x55,
|
||||
0x9d, 0x7a, 0x5d, 0x75, 0xb7, 0x0b, 0x95, 0x66, 0x58, 0x18, 0x2a, 0x17, 0x6a, 0xc3, 0x8c, 0xa9,
|
||||
0xd1, 0xa5, 0x07, 0x5a, 0x2e, 0x4a, 0x87, 0x05, 0x15, 0x61, 0xac, 0x42, 0x55, 0xc6, 0x5a, 0x90,
|
||||
0x13, 0x6d, 0xba, 0x16, 0xdc, 0x6c, 0xa2, 0x4d, 0xcd, 0xec, 0x34, 0xd4, 0xde, 0x28, 0x0d, 0xf5,
|
||||
0x1b, 0xa7, 0xc1, 0xff, 0xdd, 0x81, 0xc6, 0xb4, 0xca, 0xad, 0xe8, 0x3a, 0x6f, 0x1c, 0xdd, 0xb9,
|
||||
0xc8, 0x94, 0x6e, 0x17, 0x99, 0x3b, 0x50, 0xe5, 0x82, 0x91, 0x70, 0xa2, 0x72, 0x54, 0xc6, 0x46,
|
||||
0x92, 0xfd, 0x64, 0xc2, 0xc7, 0x2a, 0x43, 0x2d, 0x2c, 0x8f, 0xbe, 0x0f, 0xad, 0xde, 0x89, 0x20,
|
||||
0x7c, 0x8f, 0x70, 0x39, 0xc8, 0x65, 0x6e, 0x47, 0xa1, 0x08, 0xd5, 0x3d, 0x5a, 0x58, 0x9d, 0xfd,
|
||||
0x7b, 0x80, 0x76, 0x23, 0x2e, 0x5e, 0x50, 0x76, 0x44, 0x18, 0x5f, 0xb4, 0x73, 0x95, 0xad, 0x9d,
|
||||
0x6b, 0x0f, 0xde, 0x9a, 0x43, 0x9b, 0x2e, 0xf5, 0xd9, 0xb9, 0xad, 0x6b, 0x41, 0xb7, 0xd1, 0x26,
|
||||
0xe7, 0xd6, 0xae, 0x9f, 0x1d, 0x68, 0xd9, 0x7f, 0x14, 0x2a, 0xbb, 0x07, 0xd5, 0xdd, 0x70, 0x40,
|
||||
0xe2, 0xbc, 0x8d, 0xdd, 0xbd, 0x9c, 0x38, 0xd0, 0x60, 0xdd, 0xc7, 0x8d, 0xa5, 0xf7, 0x05, 0x34,
|
||||
0x2d, 0xf5, 0x4d, 0x7a, 0xf6, 0xc6, 0x3f, 0x65, 0xa8, 0x6d, 0xe9, 0x05, 0x1a, 0x3d, 0x87, 0xc6,
|
||||
0x74, 0xdd, 0x44, 0x7e, 0xd1, 0x8f, 0xf3, 0x7b, 0xab, 0xf7, 0xe1, 0xa5, 0x18, 0x13, 0xb9, 0xaf,
|
||||
0x61, 0x49, 0x2d, 0xc0, 0x68, 0x41, 0xc8, 0xec, 0xcd, 0xd8, 0xbb, 0x7c, 0x91, 0x7d, 0xe0, 0x48,
|
||||
0x26, 0x35, 0xdd, 0x16, 0x31, 0xd9, 0x2b, 0x87, 0xb7, 0x7e, 0xc5, 0x58, 0x44, 0x7b, 0x50, 0x35,
|
||||
0x8d, 0x66, 0x11, 0xd4, 0x9e, 0x61, 0x5e, 0xfb, 0x62, 0x80, 0x26, 0x7b, 0xe0, 0xa0, 0xbd, 0xe9,
|
||||
0x3e, 0xb5, 0xc8, 0x35, 0xbb, 0x40, 0xbd, 0x2b, 0xfe, 0xef, 0x38, 0x0f, 0x1c, 0xf4, 0x1d, 0x34,
|
||||
0xad, 0x12, 0x44, 0x1f, 0x15, 0x4d, 0x8a, 0xf5, 0xec, 0x7d, 0x7c, 0x05, 0x4a, 0x3b, 0xdb, 0x6b,
|
||||
0xbd, 0x3e, 0x5b, 0x73, 0xfe, 0x38, 0x5b, 0x73, 0xfe, 0x3e, 0x5b, 0x73, 0x06, 0x55, 0xf5, 0x22,
|
||||
0x3f, 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x10, 0x3d, 0x74, 0x44, 0x0d, 0x00, 0x00,
|
||||
// 1192 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0x23, 0x45,
|
||||
0x10, 0x66, 0x6c, 0xc7, 0x3f, 0x65, 0x27, 0x0a, 0x0d, 0xac, 0x46, 0x03, 0x24, 0x66, 0x00, 0xc9,
|
||||
0x8a, 0x76, 0xc7, 0xd9, 0xc0, 0x22, 0xc8, 0x61, 0xb5, 0xeb, 0x78, 0x11, 0x89, 0x12, 0xb1, 0x74,
|
||||
0x36, 0xac, 0xc4, 0x6d, 0x6c, 0x77, 0xbc, 0xa3, 0xd8, 0xd3, 0xa6, 0xbb, 0x27, 0xda, 0xf0, 0x14,
|
||||
0x1c, 0xb8, 0xf2, 0x14, 0x1c, 0x38, 0x73, 0x40, 0xda, 0x23, 0x67, 0x0e, 0x59, 0x94, 0x3b, 0x3c,
|
||||
0x03, 0xea, 0x9f, 0xb1, 0xdb, 0x1e, 0xe7, 0xc7, 0xd9, 0x53, 0xba, 0x3a, 0x5f, 0x7d, 0x53, 0x5d,
|
||||
0x5f, 0xb9, 0xaa, 0x60, 0xb9, 0x4b, 0x63, 0xc1, 0xe8, 0x20, 0x18, 0x31, 0x2a, 0x28, 0x5a, 0x1d,
|
||||
0xd2, 0xce, 0x59, 0xd0, 0x49, 0xa2, 0x41, 0xef, 0x24, 0x12, 0xc1, 0xe9, 0x7d, 0xef, 0x5e, 0x3f,
|
||||
0x12, 0x2f, 0x92, 0x4e, 0xd0, 0xa5, 0xc3, 0x66, 0x9f, 0xf6, 0x69, 0x53, 0x01, 0x3b, 0xc9, 0xb1,
|
||||
0xb2, 0x94, 0xa1, 0x4e, 0x9a, 0xc0, 0x5b, 0xef, 0x53, 0xda, 0x1f, 0x90, 0x09, 0x4a, 0x44, 0x43,
|
||||
0xc2, 0x45, 0x38, 0x1c, 0x19, 0xc0, 0x5d, 0x8b, 0x4f, 0x7e, 0xac, 0x99, 0x7e, 0xac, 0xc9, 0xe9,
|
||||
0xe0, 0x94, 0xb0, 0xe6, 0xa8, 0xd3, 0xa4, 0x23, 0xae, 0xd1, 0xfe, 0x0a, 0xd4, 0x9e, 0xb2, 0x24,
|
||||
0x26, 0x98, 0xfc, 0x98, 0x10, 0x2e, 0xfc, 0x0d, 0x58, 0x6d, 0x47, 0xfc, 0xe4, 0x88, 0x87, 0xfd,
|
||||
0xf4, 0x0e, 0xdd, 0x81, 0xe2, 0x71, 0x34, 0x10, 0x84, 0xb9, 0x4e, 0xdd, 0x69, 0x54, 0xb0, 0xb1,
|
||||
0xfc, 0x3d, 0x78, 0xdb, 0xc2, 0xf2, 0x11, 0x8d, 0x39, 0x41, 0x0f, 0xa0, 0xc8, 0x48, 0x97, 0xb2,
|
||||
0x9e, 0xeb, 0xd4, 0xf3, 0x8d, 0xea, 0xd6, 0x87, 0xc1, 0xec, 0x8b, 0x03, 0xe3, 0x20, 0x41, 0xd8,
|
||||
0x80, 0xfd, 0x3f, 0x72, 0x50, 0xb5, 0xee, 0xd1, 0x0a, 0xe4, 0x76, 0xdb, 0xe6, 0x7b, 0xb9, 0xdd,
|
||||
0x36, 0x72, 0xa1, 0x74, 0x90, 0x88, 0xb0, 0x33, 0x20, 0x6e, 0xae, 0xee, 0x34, 0xca, 0x38, 0x35,
|
||||
0xd1, 0xbb, 0xb0, 0xb4, 0x1b, 0x1f, 0x71, 0xe2, 0xe6, 0xd5, 0xbd, 0x36, 0x10, 0x82, 0xc2, 0x61,
|
||||
0xf4, 0x13, 0x71, 0x0b, 0x75, 0xa7, 0x91, 0xc7, 0xea, 0x2c, 0xdf, 0xf1, 0x34, 0x64, 0x24, 0x16,
|
||||
0xee, 0x92, 0x7e, 0x87, 0xb6, 0x50, 0x0b, 0x2a, 0x3b, 0x8c, 0x84, 0x82, 0xf4, 0x1e, 0x0b, 0xb7,
|
||||
0x58, 0x77, 0x1a, 0xd5, 0x2d, 0x2f, 0xd0, 0x69, 0x0e, 0xd2, 0x34, 0x07, 0xcf, 0xd2, 0x34, 0xb7,
|
||||
0xca, 0xaf, 0xce, 0xd7, 0xdf, 0xfa, 0xf9, 0xf5, 0xba, 0x83, 0x27, 0x6e, 0xe8, 0x11, 0xc0, 0x7e,
|
||||
0xc8, 0xc5, 0x11, 0x57, 0x24, 0xa5, 0x6b, 0x49, 0x0a, 0x8a, 0xc0, 0xf2, 0x41, 0x6b, 0x00, 0x2a,
|
||||
0x01, 0x3b, 0x34, 0x89, 0x85, 0x5b, 0x56, 0x71, 0x5b, 0x37, 0xa8, 0x0e, 0xd5, 0x36, 0xe1, 0x5d,
|
||||
0x16, 0x8d, 0x44, 0x44, 0x63, 0xb7, 0xa2, 0x9e, 0x60, 0x5f, 0xf9, 0xbf, 0x14, 0xa0, 0x76, 0x28,
|
||||
0x35, 0x4e, 0x85, 0x5b, 0x85, 0x3c, 0x26, 0xc7, 0x26, 0x8b, 0xf2, 0x88, 0x02, 0x80, 0x36, 0x39,
|
||||
0x8e, 0xe2, 0x48, 0x71, 0xe4, 0x54, 0x98, 0x2b, 0xc1, 0xa8, 0x13, 0x4c, 0x6e, 0xb1, 0x85, 0x40,
|
||||
0x1e, 0x94, 0x9f, 0xbc, 0x1c, 0x51, 0x26, 0xc5, 0xcf, 0x2b, 0x9a, 0xb1, 0x8d, 0x9e, 0xc3, 0x72,
|
||||
0x7a, 0x7e, 0x2c, 0x04, 0xe3, 0x6e, 0x41, 0x09, 0x7e, 0x3f, 0x2b, 0xb8, 0x1d, 0x54, 0x30, 0xe5,
|
||||
0xf3, 0x24, 0x16, 0xec, 0x0c, 0x4f, 0xf3, 0x48, 0xad, 0x0f, 0x09, 0xe7, 0x32, 0x42, 0x2d, 0x54,
|
||||
0x6a, 0xca, 0x70, 0xbe, 0x66, 0x34, 0x16, 0x24, 0xee, 0x29, 0xa1, 0x2a, 0x78, 0x6c, 0xcb, 0x70,
|
||||
0xd2, 0xb3, 0x0e, 0xa7, 0x74, 0xa3, 0x70, 0xa6, 0x7c, 0x4c, 0x38, 0x53, 0x77, 0x68, 0x1b, 0x96,
|
||||
0x76, 0xc2, 0xee, 0x0b, 0xa2, 0x34, 0xa9, 0x6e, 0xad, 0x65, 0x09, 0xd5, 0xbf, 0xbf, 0x55, 0x22,
|
||||
0xf0, 0x56, 0x41, 0x96, 0x07, 0xd6, 0x2e, 0xde, 0x23, 0x40, 0xd9, 0xf7, 0x4a, 0x5d, 0x4e, 0xc8,
|
||||
0x59, 0xaa, 0xcb, 0x09, 0x39, 0x93, 0x45, 0x7c, 0x1a, 0x0e, 0x12, 0x5d, 0xdc, 0x15, 0xac, 0x8d,
|
||||
0xed, 0xdc, 0x97, 0x8e, 0x64, 0xc8, 0x86, 0xb8, 0x08, 0x83, 0xff, 0xda, 0x81, 0x9a, 0x1d, 0x21,
|
||||
0xfa, 0x00, 0x2a, 0x3a, 0xa8, 0x49, 0x71, 0x4c, 0x2e, 0x64, 0x1d, 0xee, 0x0e, 0x8d, 0xc1, 0xdd,
|
||||
0x5c, 0x3d, 0xdf, 0xa8, 0x60, 0xeb, 0x06, 0x7d, 0x07, 0x55, 0x0d, 0xd6, 0x59, 0xce, 0xab, 0x2c,
|
||||
0x37, 0xaf, 0x4e, 0x4a, 0x60, 0x79, 0xe8, 0x1c, 0xdb, 0x1c, 0xde, 0x43, 0x58, 0x9d, 0x05, 0x2c,
|
||||
0xf4, 0xc2, 0xdf, 0x1d, 0x58, 0x36, 0xa2, 0x9a, 0x2e, 0x14, 0xa6, 0x8c, 0x84, 0xa5, 0x77, 0xa6,
|
||||
0x1f, 0x3d, 0xb8, 0xb4, 0x1e, 0x34, 0x2c, 0x98, 0xf5, 0xd3, 0xf1, 0x66, 0xe8, 0xbc, 0x1d, 0x78,
|
||||
0x6f, 0x2e, 0x74, 0xa1, 0xc8, 0x3f, 0x82, 0xe5, 0x43, 0x11, 0x8a, 0x84, 0x5f, 0xfa, 0x93, 0xf5,
|
||||
0x7f, 0x73, 0x60, 0x25, 0xc5, 0x98, 0xd7, 0x7d, 0x0e, 0xe5, 0x53, 0xc2, 0x04, 0x79, 0x49, 0xb8,
|
||||
0x79, 0x95, 0x9b, 0x7d, 0xd5, 0xf7, 0x0a, 0x81, 0xc7, 0x48, 0xb4, 0x0d, 0x65, 0xae, 0x78, 0x88,
|
||||
0x96, 0x75, 0x6e, 0x29, 0x6b, 0x2f, 0xf3, 0xbd, 0x31, 0x1e, 0x35, 0xa1, 0x30, 0xa0, 0xfd, 0x54,
|
||||
0xed, 0xf7, 0x2f, 0xf3, 0xdb, 0xa7, 0x7d, 0xac, 0x80, 0xfe, 0x79, 0x0e, 0x8a, 0xfa, 0x0e, 0xed,
|
||||
0x41, 0xb1, 0x17, 0xf5, 0x09, 0x17, 0xfa, 0x55, 0xad, 0x2d, 0xf9, 0x03, 0xf9, 0xfb, 0x7c, 0x7d,
|
||||
0xc3, 0x1a, 0x54, 0x74, 0x44, 0x62, 0x39, 0x28, 0xc3, 0x28, 0x26, 0x8c, 0x37, 0xfb, 0xf4, 0x9e,
|
||||
0x76, 0x09, 0xda, 0xea, 0x0f, 0x36, 0x0c, 0x92, 0x2b, 0x8a, 0x47, 0x89, 0x30, 0x85, 0x79, 0x3b,
|
||||
0x2e, 0xcd, 0x20, 0x47, 0x44, 0x1c, 0x0e, 0x89, 0xe9, 0x6b, 0xea, 0x2c, 0x47, 0x44, 0x57, 0xd6,
|
||||
0x6d, 0x4f, 0x0d, 0x8e, 0x32, 0x36, 0x16, 0xda, 0x86, 0x12, 0x17, 0x21, 0x13, 0xa4, 0xa7, 0x5a,
|
||||
0xd2, 0x4d, 0x7a, 0x7b, 0xea, 0x80, 0x1e, 0x42, 0xa5, 0x4b, 0x87, 0xa3, 0x01, 0x91, 0xde, 0xc5,
|
||||
0x1b, 0x7a, 0x4f, 0x5c, 0x64, 0xf5, 0x10, 0xc6, 0x28, 0x53, 0x53, 0xa5, 0x82, 0xb5, 0xe1, 0xff,
|
||||
0x97, 0x83, 0x9a, 0x2d, 0x56, 0x66, 0x62, 0xee, 0x41, 0x51, 0x4b, 0xaf, 0xab, 0xee, 0x76, 0xa9,
|
||||
0xd2, 0x0c, 0x73, 0x53, 0xe5, 0x42, 0xa9, 0x9b, 0x30, 0x35, 0x4e, 0xf5, 0x90, 0x4d, 0x4d, 0x19,
|
||||
0xb0, 0xa0, 0x22, 0x1c, 0xa8, 0x54, 0xe5, 0xb1, 0x36, 0xe4, 0x94, 0x1d, 0xaf, 0x2a, 0x8b, 0x4d,
|
||||
0xd9, 0xb1, 0x9b, 0x2d, 0x43, 0xe9, 0x8d, 0x64, 0x28, 0x2f, 0x2c, 0x83, 0xff, 0xa7, 0x03, 0x95,
|
||||
0x71, 0x95, 0x5b, 0xd9, 0x75, 0xde, 0x38, 0xbb, 0x53, 0x99, 0xc9, 0xdd, 0x2e, 0x33, 0x77, 0xa0,
|
||||
0xc8, 0x05, 0x23, 0xe1, 0x50, 0x69, 0x94, 0xc7, 0xc6, 0x92, 0xfd, 0x64, 0xc8, 0xfb, 0x4a, 0xa1,
|
||||
0x1a, 0x96, 0x47, 0xdf, 0x87, 0x5a, 0xeb, 0x4c, 0x10, 0x7e, 0x40, 0xb8, 0x5c, 0x2e, 0xa4, 0xb6,
|
||||
0xbd, 0x50, 0x84, 0xea, 0x1d, 0x35, 0xac, 0xce, 0xfe, 0x5d, 0x40, 0xfb, 0x11, 0x17, 0xcf, 0x29,
|
||||
0x3b, 0x21, 0x8c, 0xcf, 0xdb, 0x03, 0xf3, 0xd6, 0x1e, 0x78, 0x00, 0xef, 0x4c, 0xa1, 0x4d, 0x97,
|
||||
0xfa, 0x62, 0x66, 0x13, 0x9c, 0xd3, 0x6d, 0xb4, 0xcb, 0xcc, 0x2a, 0xf8, 0xab, 0x03, 0x35, 0xfb,
|
||||
0x1f, 0x99, 0xca, 0x6e, 0x41, 0x71, 0x3f, 0xec, 0x90, 0x41, 0xda, 0xc6, 0x36, 0xae, 0x26, 0x0e,
|
||||
0x34, 0x58, 0xf7, 0x71, 0xe3, 0xe9, 0x7d, 0x05, 0x55, 0xeb, 0x7a, 0x91, 0x9e, 0xbd, 0xf5, 0x6f,
|
||||
0x1e, 0x4a, 0x3b, 0x7a, 0xa9, 0x47, 0xcf, 0xa0, 0x32, 0x5e, 0x81, 0x91, 0x9f, 0x8d, 0x63, 0x76,
|
||||
0x97, 0xf6, 0x3e, 0xbe, 0x12, 0x63, 0x32, 0xf7, 0x0d, 0x2c, 0xa9, 0xa5, 0x1c, 0xcd, 0x49, 0x99,
|
||||
0xbd, 0xad, 0x7b, 0x57, 0x2f, 0xd7, 0x9b, 0x8e, 0x64, 0x52, 0xd3, 0x6d, 0x1e, 0x93, 0xbd, 0x06,
|
||||
0x79, 0xeb, 0xd7, 0x8c, 0x45, 0x74, 0x00, 0x45, 0xd3, 0x68, 0xe6, 0x41, 0xed, 0x19, 0xe6, 0xd5,
|
||||
0x2f, 0x07, 0x68, 0xb2, 0x4d, 0x07, 0x1d, 0x8c, 0x77, 0xbc, 0x79, 0xa1, 0xd9, 0x05, 0xea, 0x5d,
|
||||
0xf3, 0xff, 0x86, 0xb3, 0xe9, 0xa0, 0x1f, 0xa0, 0x6a, 0x95, 0x20, 0xfa, 0x24, 0xeb, 0x92, 0xad,
|
||||
0x67, 0xef, 0xd3, 0x6b, 0x50, 0x3a, 0xd8, 0x56, 0xed, 0xd5, 0xc5, 0x9a, 0xf3, 0xd7, 0xc5, 0x9a,
|
||||
0xf3, 0xcf, 0xc5, 0x9a, 0xd3, 0x29, 0xaa, 0x5f, 0xe4, 0x67, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
|
||||
0x4d, 0x94, 0x5a, 0xb6, 0xd8, 0x0d, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ message SolveRequest {
|
|||
message CacheOptions {
|
||||
string ExportRef = 1;
|
||||
repeated string ImportRefs = 2;
|
||||
map<string, string> ExportAttrs = 3;
|
||||
}
|
||||
|
||||
message SolveResponse {
|
||||
|
|
|
|||
|
|
@ -156,7 +156,6 @@ func (c *Controller) Solve(ctx context.Context, req *controlapi.SolveRequest) (*
|
|||
return nil, err
|
||||
}
|
||||
exportCacheRef := reference.TagNameOnly(parsed).String()
|
||||
|
||||
cacheExporter = c.opt.CacheExporter.ExporterForTarget(exportCacheRef)
|
||||
}
|
||||
|
||||
|
|
@ -175,8 +174,9 @@ func (c *Controller) Solve(ctx context.Context, req *controlapi.SolveRequest) (*
|
|||
FrontendOpt: req.FrontendAttrs,
|
||||
ImportCacheRefs: importCacheRefs,
|
||||
}, llbsolver.ExporterRequest{
|
||||
Exporter: expi,
|
||||
CacheExporter: cacheExporter,
|
||||
Exporter: expi,
|
||||
CacheExporter: cacheExporter,
|
||||
CacheExportMode: parseCacheExporterOpt(req.Cache.ExportAttrs),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -271,3 +271,22 @@ func (c *Controller) ListWorkers(ctx context.Context, r *controlapi.ListWorkersR
|
|||
}
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func parseCacheExporterOpt(opt map[string]string) solver.CacheExportMode {
|
||||
for k, v := range opt {
|
||||
switch k {
|
||||
case "mode":
|
||||
switch v {
|
||||
case "min":
|
||||
return solver.CacheExportModeMin
|
||||
case "max":
|
||||
return solver.CacheExportModeMax
|
||||
default:
|
||||
logrus.Debugf("skipping incalid cache export mode: %s", v)
|
||||
}
|
||||
default:
|
||||
logrus.Warnf("skipping invalid cache export opt: %s", v)
|
||||
}
|
||||
}
|
||||
return solver.CacheExportModeMin
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,9 @@ import (
|
|||
)
|
||||
|
||||
type ExporterRequest struct {
|
||||
Exporter exporter.ExporterInstance
|
||||
CacheExporter *remotecache.RegistryCacheExporter
|
||||
Exporter exporter.ExporterInstance
|
||||
CacheExporter *remotecache.RegistryCacheExporter
|
||||
CacheExportMode solver.CacheExportMode
|
||||
}
|
||||
|
||||
// ResolveWorkerFunc returns default worker for the temporary default non-distributed use cases
|
||||
|
|
@ -109,17 +110,18 @@ func (s *Solver) Solve(ctx context.Context, id string, req frontend.SolveRequest
|
|||
}
|
||||
}
|
||||
|
||||
if exp := exp.CacheExporter; exp != nil {
|
||||
if e := exp.CacheExporter; e != nil {
|
||||
if err := j.Call(ctx, "exporting cache", func(ctx context.Context) error {
|
||||
prepareDone := oneOffProgress(ctx, "preparing build cache for export")
|
||||
if _, err := res.CacheKey().Exporter.ExportTo(ctx, exp, solver.CacheExportOpt{
|
||||
if _, err := res.CacheKey().Exporter.ExportTo(ctx, e, solver.CacheExportOpt{
|
||||
Convert: workerRefConverter,
|
||||
Mode: exp.CacheExportMode,
|
||||
}); err != nil {
|
||||
return prepareDone(err)
|
||||
}
|
||||
prepareDone(nil)
|
||||
|
||||
return exp.Finalize(ctx)
|
||||
return e.Finalize(ctx)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue