JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cache: add all option to prune 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-07-26 15:31:35 -07:00
parent 489246dd28
commit 97fa2b527a
8 changed files with 161 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
api/services/control/control.pb.go
View File

@ -58,6 +58,7 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type PruneRequest struct {
Filter []string `protobuf:"bytes,1,rep,name=filter" json:"filter,omitempty"`
All bool `protobuf:"varint,2,opt,name=all,proto3" json:"all,omitempty"`
}
func (m *PruneRequest) Reset() { *m = PruneRequest{} }
@ -72,6 +73,13 @@ func (m *PruneRequest) GetFilter() []string {
return nil
}
func (m *PruneRequest) GetAll() bool {
if m != nil {
return m.All
}
return false
}
type DiskUsageRequest struct {
Filter []string `protobuf:"bytes,1,rep,name=filter" json:"filter,omitempty"`
}
@ -929,6 +937,16 @@ func (m *PruneRequest) MarshalTo(dAtA []byte) (int, error) {
i += copy(dAtA[i:], s)
}
}
if m.All {
dAtA[i] = 0x10
i++
if m.All {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
i++
}
return i, nil
}
@ -1651,6 +1669,9 @@ func (m *PruneRequest) Size() (n int) {
n += 1 + l + sovControl(uint64(l))
}
}
if m.All {
n += 2
}
return n
}
@ -2027,6 +2048,26 @@ func (m *PruneRequest) Unmarshal(dAtA []byte) error {
}
m.Filter = append(m.Filter, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 2:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field All", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowControl
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
v |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
m.All = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipControl(dAtA[iNdEx:])
@ -4627,79 +4668,80 @@ var (
func init() { proto.RegisterFile("control.proto", fileDescriptorControl) }
var fileDescriptorControl = []byte{
// 1183 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
0x14, 0x66, 0x6d, 0xc7, 0x3f, 0xc7, 0x4e, 0x14, 0x06, 0xa8, 0x56, 0x0b, 0x24, 0x66, 0xf9, 0x91,
0x55, 0xb5, 0xbb, 0x69, 0xa0, 0x12, 0x8a, 0x50, 0xd5, 0x3a, 0x2e, 0x22, 0x51, 0x22, 0xca, 0x24,
0xa1, 0x12, 0x77, 0x6b, 0x7b, 0xe2, 0xae, 0x62, 0xef, 0x2c, 0x33, 0xe3, 0x50, 0xf3, 0x14, 0x5c,
0xf0, 0x26, 0x5c, 0xf0, 0x04, 0x48, 0xbd, 0xe4, 0x9a, 0x8b, 0x14, 0x72, 0x0f, 0xcf, 0x80, 0xe6,
0x67, 0xed, 0x71, 0xec, 0xc4, 0x49, 0x7a, 0x95, 0x39, 0x27, 0xdf, 0xf9, 0xf6, 0xcc, 0xf9, 0x8e,
0xe7, 0x1c, 0x58, 0xee, 0xd0, 0x44, 0x30, 0xda, 0x0f, 0x52, 0x46, 0x05, 0x45, 0xab, 0x03, 0xda,
0x1e, 0x05, 0xed, 0x61, 0xdc, 0xef, 0x9e, 0xc4, 0x22, 0x38, 0x7d, 0xe0, 0xdd, 0xef, 0xc5, 0xe2,
0xc5, 0xb0, 0x1d, 0x74, 0xe8, 0x20, 0xec, 0xd1, 0x1e, 0x0d, 0x15, 0xb0, 0x3d, 0x3c, 0x56, 0x96,
0x32, 0xd4, 0x49, 0x13, 0x78, 0xeb, 0x3d, 0x4a, 0x7b, 0x7d, 0x32, 0x41, 0x89, 0x78, 0x40, 0xb8,
0x88, 0x06, 0xa9, 0x01, 0xdc, 0xb3, 0xf8, 0xe4, 0xc7, 0xc2, 0xec, 0x63, 0x21, 0xa7, 0xfd, 0x53,
0xc2, 0xc2, 0xb4, 0x1d, 0xd2, 0x94, 0x1b, 0x74, 0x78, 0x29, 0x3a, 0x4a, 0xe3, 0x50, 0x8c, 0x52,
0xc2, 0xc3, 0x9f, 0x28, 0x3b, 0x21, 0x4c, 0x07, 0xf8, 0x9f, 0x41, 0xed, 0x19, 0x1b, 0x26, 0x04,
0x93, 0x1f, 0x87, 0x84, 0x0b, 0x74, 0x07, 0x8a, 0xc7, 0x71, 0x5f, 0x10, 0xe6, 0x3a, 0xf5, 0x7c,
0xa3, 0x82, 0x8d, 0xe5, 0xdf, 0x85, 0xd5, 0x56, 0xcc, 0x4f, 0x8e, 0x78, 0xd4, 0x5b, 0x88, 0xdd,
0x85, 0xb7, 0x2d, 0x2c, 0x4f, 0x69, 0xc2, 0x09, 0x7a, 0x08, 0x45, 0x46, 0x3a, 0x94, 0x75, 0x15,
0xb8, 0xba, 0xf9, 0x61, 0x70, 0xb1, 0x74, 0x81, 0x09, 0x90, 0x20, 0x6c, 0xc0, 0xfe, 0x3f, 0x39,
0xa8, 0x5a, 0x7e, 0xb4, 0x02, 0xb9, 0x9d, 0x96, 0xeb, 0xd4, 0x9d, 0x46, 0x05, 0xe7, 0x76, 0x5a,
0xc8, 0x85, 0xd2, 0xfe, 0x50, 0x44, 0xed, 0x3e, 0x71, 0x73, 0x75, 0xa7, 0x51, 0xc6, 0x99, 0x89,
0xde, 0x85, 0xa5, 0x9d, 0xe4, 0x88, 0x13, 0x37, 0xaf, 0xfc, 0xda, 0x40, 0x08, 0x0a, 0x07, 0xf1,
0xcf, 0xc4, 0x2d, 0xd4, 0x9d, 0x46, 0x1e, 0xab, 0xb3, 0xbc, 0xc7, 0xb3, 0x88, 0x91, 0x44, 0xb8,
0x4b, 0x8a, 0xd7, 0x58, 0xa8, 0x09, 0x95, 0x6d, 0x46, 0x22, 0x41, 0xba, 0x4f, 0x84, 0x5b, 0xac,
0x3b, 0x8d, 0xea, 0xa6, 0x17, 0x68, 0xbd, 0x82, 0x4c, 0xaf, 0xe0, 0x30, 0xd3, 0xab, 0x59, 0x7e,
0x75, 0xb6, 0xfe, 0xd6, 0x2f, 0xaf, 0xd7, 0x1d, 0x3c, 0x09, 0x43, 0x8f, 0x01, 0xf6, 0x22, 0x2e,
0x8e, 0xb8, 0x22, 0x29, 0x2d, 0x24, 0x29, 0x28, 0x02, 0x2b, 0x06, 0xad, 0x01, 0xa8, 0x02, 0x6c,
0xd3, 0x61, 0x22, 0xdc, 0xb2, 0xca, 0xdb, 0xf2, 0xa0, 0x3a, 0x54, 0x5b, 0x84, 0x77, 0x58, 0x9c,
0x8a, 0x98, 0x26, 0x6e, 0x45, 0x5d, 0xc1, 0x76, 0x49, 0x06, 0x5d, 0xbd, 0xc3, 0x51, 0x4a, 0x5c,
0x50, 0x00, 0xcb, 0xe3, 0xff, 0x5a, 0x80, 0xda, 0x81, 0x6c, 0xa6, 0x4c, 0xd8, 0x55, 0xc8, 0x63,
0x72, 0x6c, 0xaa, 0x2c, 0x8f, 0x28, 0x00, 0x68, 0x91, 0xe3, 0x38, 0x89, 0xd5, 0x37, 0x72, 0xea,
0x1a, 0x2b, 0x41, 0xda, 0x0e, 0x26, 0x5e, 0x6c, 0x21, 0x90, 0x07, 0xe5, 0xa7, 0x2f, 0x53, 0xca,
0x64, 0x73, 0xe4, 0x15, 0xcd, 0xd8, 0x46, 0xcf, 0x61, 0x39, 0x3b, 0x3f, 0x11, 0x82, 0x71, 0xb7,
0xa0, 0x1a, 0xe2, 0xc1, 0x6c, 0x43, 0xd8, 0x49, 0x05, 0x53, 0x31, 0x4f, 0x13, 0xc1, 0x46, 0x78,
0x9a, 0x47, 0xf6, 0xc2, 0x01, 0xe1, 0x5c, 0x66, 0xa8, 0x85, 0xcc, 0x4c, 0x99, 0xce, 0xd7, 0x8c,
0x26, 0x82, 0x24, 0x5d, 0x25, 0x64, 0x05, 0x8f, 0x6d, 0x99, 0x4e, 0x76, 0xd6, 0xe9, 0x94, 0xae,
0x95, 0xce, 0x54, 0x8c, 0x49, 0x67, 0xca, 0x87, 0xb6, 0x60, 0x69, 0x3b, 0xea, 0xbc, 0x20, 0x4a,
0xb3, 0xea, 0xe6, 0xda, 0x2c, 0xa1, 0xfa, 0xf7, 0xb7, 0x4a, 0x24, 0xde, 0x2c, 0xc8, 0xf6, 0xc1,
0x3a, 0xc4, 0x7b, 0x0c, 0x68, 0xf6, 0xbe, 0x52, 0x97, 0x13, 0x32, 0xca, 0x74, 0x39, 0x21, 0x23,
0xd9, 0xe4, 0xa7, 0x51, 0x7f, 0xa8, 0x9b, 0xbf, 0x82, 0xb5, 0xb1, 0x95, 0xfb, 0xd2, 0x91, 0x0c,
0xb3, 0x29, 0xde, 0x84, 0xc1, 0x7f, 0xed, 0x40, 0xcd, 0xce, 0x10, 0x7d, 0x00, 0x15, 0x9d, 0xd4,
0xa4, 0x39, 0x26, 0x0e, 0xd9, 0x65, 0x3b, 0x03, 0x63, 0x70, 0x37, 0xa7, 0x5e, 0x04, 0xcb, 0x83,
0xbe, 0x83, 0xaa, 0x06, 0xeb, 0x2a, 0xe7, 0x55, 0x95, 0xc3, 0xab, 0x8b, 0x12, 0x58, 0x11, 0xba,
0xc6, 0x36, 0x87, 0xf7, 0x08, 0x56, 0x2f, 0x02, 0x6e, 0x74, 0xc3, 0xdf, 0x1d, 0x58, 0x36, 0xa2,
0x9a, 0x57, 0x2a, 0xca, 0x18, 0x09, 0xcb, 0x7c, 0xe6, 0xbd, 0x7a, 0x78, 0x69, 0x3f, 0x68, 0x58,
0x70, 0x31, 0x4e, 0xe7, 0x3b, 0x43, 0xe7, 0x6d, 0xc3, 0x7b, 0x73, 0xa1, 0x37, 0xca, 0xfc, 0x23,
0x58, 0x3e, 0x10, 0x91, 0x18, 0xf2, 0x4b, 0x7f, 0xb2, 0xfe, 0x6f, 0x0e, 0xac, 0x64, 0x18, 0x73,
0xbb, 0x2f, 0xa0, 0x7c, 0x4a, 0x98, 0x20, 0x2f, 0x09, 0x37, 0xb7, 0x72, 0x67, 0x6f, 0xf5, 0xbd,
0x42, 0xe0, 0x31, 0x12, 0x6d, 0x41, 0x99, 0x2b, 0x1e, 0xa2, 0x65, 0x9d, 0xdb, 0xca, 0x3a, 0xca,
0x7c, 0x6f, 0x8c, 0x47, 0x21, 0x14, 0xfa, 0xb4, 0x97, 0xa9, 0xfd, 0xfe, 0x65, 0x71, 0x7b, 0xb4,
0x87, 0x15, 0xd0, 0x3f, 0xcb, 0x41, 0x51, 0xfb, 0xd0, 0x2e, 0x14, 0xbb, 0x71, 0x8f, 0x70, 0xa1,
0x6f, 0xd5, 0xdc, 0x94, 0x3f, 0x90, 0xbf, 0xce, 0xd6, 0xef, 0x5a, 0x33, 0x8e, 0xa6, 0x24, 0x91,
0x13, 0x39, 0x8a, 0x13, 0xc2, 0x78, 0xd8, 0xa3, 0xf7, 0x75, 0x48, 0xd0, 0x52, 0x7f, 0xb0, 0x61,
0x90, 0x5c, 0x71, 0x92, 0x0e, 0x85, 0x69, 0xcc, 0xdb, 0x71, 0x69, 0x06, 0x39, 0x42, 0x92, 0x68,
0x40, 0xcc, 0xbb, 0xa6, 0xce, 0x72, 0x84, 0x74, 0x64, 0xdf, 0x76, 0xd5, 0x60, 0x29, 0x63, 0x63,
0xa1, 0x2d, 0x28, 0x71, 0x11, 0x31, 0x41, 0xba, 0xea, 0x49, 0xba, 0xce, 0xdb, 0x9f, 0x05, 0xa0,
0x47, 0x50, 0xe9, 0xd0, 0x41, 0xda, 0x27, 0x32, 0xba, 0x78, 0xcd, 0xe8, 0x49, 0x88, 0xec, 0x1e,
0xc2, 0x18, 0x65, 0x6a, 0xea, 0x54, 0xb0, 0x36, 0xfc, 0xff, 0x72, 0x50, 0xb3, 0xc5, 0x9a, 0x99,
0xa8, 0xbb, 0x50, 0xd4, 0xd2, 0xeb, 0xae, 0xbb, 0x5d, 0xa9, 0x34, 0xc3, 0xdc, 0x52, 0xb9, 0x50,
0xea, 0x0c, 0x99, 0x1a, 0xb7, 0x7a, 0x08, 0x67, 0xa6, 0x4c, 0x58, 0x50, 0x11, 0xf5, 0x55, 0xa9,
0xf2, 0x58, 0x1b, 0x72, 0x0a, 0x8f, 0x77, 0xa2, 0x9b, 0x4d, 0xe1, 0x71, 0x98, 0x2d, 0x43, 0xe9,
0x8d, 0x64, 0x28, 0xdf, 0x58, 0x06, 0xff, 0x0f, 0x07, 0x2a, 0xe3, 0x2e, 0xb7, 0xaa, 0xeb, 0xbc,
0x71, 0x75, 0xa7, 0x2a, 0x93, 0xbb, 0x5d, 0x65, 0xee, 0x40, 0x91, 0x0b, 0x46, 0xa2, 0x81, 0xd2,
0x28, 0x8f, 0x8d, 0x25, 0xdf, 0x93, 0x01, 0xef, 0x29, 0x85, 0x6a, 0x58, 0x1e, 0x7d, 0x1f, 0x6a,
0xcd, 0x91, 0x20, 0x7c, 0x9f, 0x70, 0xb9, 0x7c, 0x48, 0x6d, 0xbb, 0x91, 0x88, 0xd4, 0x3d, 0x6a,
0x58, 0x9d, 0xfd, 0x7b, 0x80, 0xf6, 0x62, 0x2e, 0x9e, 0xab, 0x0d, 0x93, 0x2f, 0xda, 0x13, 0x0f,
0xe0, 0x9d, 0x29, 0xb4, 0x79, 0xa5, 0xbe, 0xba, 0xb0, 0x29, 0x7e, 0x32, 0xfb, 0x6a, 0xa8, 0x45,
0x36, 0xd0, 0x81, 0xd3, 0x0b, 0xe3, 0xe6, 0xbf, 0x79, 0x28, 0x6d, 0xeb, 0x1d, 0x1d, 0x1d, 0x42,
0x65, 0xbc, 0x88, 0x22, 0x7f, 0x96, 0xe6, 0xe2, 0x46, 0xeb, 0x7d, 0x7c, 0x25, 0xc6, 0xe4, 0xf7,
0x0d, 0x2c, 0xa9, 0x95, 0x19, 0xcd, 0x79, 0x06, 0xed, 0x5d, 0xda, 0xbb, 0x7a, 0xc5, 0xdd, 0x70,
0x24, 0x93, 0x9a, 0x21, 0xf3, 0x98, 0xec, 0x65, 0xc3, 0x5b, 0x5f, 0x30, 0x7c, 0xd0, 0x3e, 0x14,
0xcd, 0xcf, 0x79, 0x1e, 0xd4, 0x9e, 0x14, 0x5e, 0xfd, 0x72, 0x80, 0x26, 0xdb, 0x70, 0xd0, 0xfe,
0x78, 0x93, 0x9a, 0x97, 0x9a, 0xdd, 0x06, 0xde, 0x82, 0xff, 0x37, 0x9c, 0x0d, 0x07, 0xfd, 0x00,
0x55, 0x4b, 0x68, 0x34, 0x47, 0xd0, 0xd9, 0xae, 0xf1, 0x3e, 0x5d, 0x80, 0xd2, 0xc9, 0x36, 0x6b,
0xaf, 0xce, 0xd7, 0x9c, 0x3f, 0xcf, 0xd7, 0x9c, 0xbf, 0xcf, 0xd7, 0x9c, 0x76, 0x51, 0xf5, 0xfd,
0xe7, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x00, 0xae, 0x7b, 0x36, 0xa7, 0x0d, 0x00, 0x00,
// 1193 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5f, 0x6f, 0x1b, 0x45,
0x10, 0xe7, 0x6c, 0xc7, 0x7f, 0xc6, 0x4e, 0x14, 0x16, 0xa8, 0x4e, 0x07, 0x24, 0xe6, 0x00, 0xc9,
0xaa, 0xda, 0xbb, 0x34, 0x50, 0xa9, 0x8a, 0x50, 0xd5, 0x3a, 0x2e, 0x22, 0x51, 0x22, 0xca, 0x25,
0xa1, 0x12, 0x6f, 0x67, 0x7b, 0xe3, 0x9e, 0x72, 0xbe, 0x3d, 0x76, 0xf7, 0x42, 0xcd, 0xa7, 0xe0,
0x81, 0x6f, 0xc2, 0x03, 0x9f, 0x00, 0xa9, 0x8f, 0x3c, 0xf3, 0x90, 0x42, 0xde, 0xe1, 0x33, 0xa0,
0xfd, 0x73, 0xf6, 0x3a, 0x76, 0xe2, 0x24, 0x7d, 0xca, 0xce, 0xe4, 0x37, 0xbf, 0x9b, 0x9d, 0xdf,
0x78, 0x67, 0x60, 0xb9, 0x47, 0x12, 0x4e, 0x49, 0xec, 0xa5, 0x94, 0x70, 0x82, 0x56, 0x87, 0xa4,
0x3b, 0xf2, 0xba, 0x59, 0x14, 0xf7, 0x4f, 0x22, 0xee, 0x9d, 0x3e, 0x70, 0xee, 0x0f, 0x22, 0xfe,
0x32, 0xeb, 0x7a, 0x3d, 0x32, 0xf4, 0x07, 0x64, 0x40, 0x7c, 0x09, 0xec, 0x66, 0xc7, 0xd2, 0x92,
0x86, 0x3c, 0x29, 0x02, 0x67, 0x7d, 0x40, 0xc8, 0x20, 0xc6, 0x13, 0x14, 0x8f, 0x86, 0x98, 0xf1,
0x70, 0x98, 0x6a, 0xc0, 0x3d, 0x83, 0x4f, 0x7c, 0xcc, 0xcf, 0x3f, 0xe6, 0x33, 0x12, 0x9f, 0x62,
0xea, 0xa7, 0x5d, 0x9f, 0xa4, 0x4c, 0xa3, 0xfd, 0x4b, 0xd1, 0x61, 0x1a, 0xf9, 0x7c, 0x94, 0x62,
0xe6, 0xff, 0x44, 0xe8, 0x09, 0xa6, 0x2a, 0xc0, 0x7d, 0x04, 0x8d, 0xe7, 0x34, 0x4b, 0x70, 0x80,
0x7f, 0xcc, 0x30, 0xe3, 0xe8, 0x0e, 0x94, 0x8f, 0xa3, 0x98, 0x63, 0x6a, 0x5b, 0xcd, 0x62, 0xab,
0x16, 0x68, 0x0b, 0xad, 0x42, 0x31, 0x8c, 0x63, 0xbb, 0xd0, 0xb4, 0x5a, 0xd5, 0x40, 0x1c, 0xdd,
0xbb, 0xb0, 0xda, 0x89, 0xd8, 0xc9, 0x11, 0x0b, 0x07, 0x8b, 0xa2, 0xdd, 0x5d, 0x78, 0xd7, 0xc0,
0xb2, 0x94, 0x24, 0x0c, 0xa3, 0x87, 0x50, 0xa6, 0xb8, 0x47, 0x68, 0x5f, 0x82, 0xeb, 0x9b, 0x1f,
0x7b, 0x17, 0x8b, 0xe9, 0xe9, 0x00, 0x01, 0x0a, 0x34, 0xd8, 0xfd, 0xa7, 0x00, 0x75, 0xc3, 0x8f,
0x56, 0xa0, 0xb0, 0xd3, 0xb1, 0xad, 0xa6, 0xd5, 0xaa, 0x05, 0x85, 0x9d, 0x0e, 0xb2, 0xa1, 0xb2,
0x9f, 0xf1, 0xb0, 0x1b, 0x63, 0x9d, 0x6d, 0x6e, 0xa2, 0xf7, 0x61, 0x69, 0x27, 0x39, 0x62, 0xd8,
0x2e, 0x4a, 0xbf, 0x32, 0x10, 0x82, 0xd2, 0x41, 0xf4, 0x33, 0xb6, 0x4b, 0x4d, 0xab, 0x55, 0x0c,
0xe4, 0x59, 0xdc, 0xe3, 0x79, 0x48, 0x71, 0xc2, 0xed, 0x25, 0xc9, 0xab, 0x2d, 0xd4, 0x86, 0xda,
0x36, 0xc5, 0x21, 0xc7, 0xfd, 0xa7, 0xdc, 0x2e, 0x37, 0xad, 0x56, 0x7d, 0xd3, 0xf1, 0x94, 0x82,
0x5e, 0xae, 0xa0, 0x77, 0x98, 0x2b, 0xd8, 0xae, 0xbe, 0x3e, 0x5b, 0x7f, 0xe7, 0x97, 0x37, 0xeb,
0x56, 0x30, 0x09, 0x43, 0x4f, 0x00, 0xf6, 0x42, 0xc6, 0x8f, 0x98, 0x24, 0xa9, 0x2c, 0x24, 0x29,
0x49, 0x02, 0x23, 0x06, 0xad, 0x01, 0xc8, 0x02, 0x6c, 0x93, 0x2c, 0xe1, 0x76, 0x55, 0xe6, 0x6d,
0x78, 0x50, 0x13, 0xea, 0x1d, 0xcc, 0x7a, 0x34, 0x4a, 0x79, 0x44, 0x12, 0xbb, 0x26, 0xaf, 0x60,
0xba, 0x04, 0x83, 0xaa, 0xde, 0xe1, 0x28, 0xc5, 0x36, 0x48, 0x80, 0xe1, 0x71, 0x7f, 0x2d, 0x41,
0xe3, 0x40, 0xb4, 0x57, 0x2e, 0xec, 0x2a, 0x14, 0x03, 0x7c, 0xac, 0xab, 0x2c, 0x8e, 0xc8, 0x03,
0xe8, 0xe0, 0xe3, 0x28, 0x89, 0xe4, 0x37, 0x0a, 0xf2, 0x1a, 0x2b, 0x5e, 0xda, 0xf5, 0x26, 0xde,
0xc0, 0x40, 0x20, 0x07, 0xaa, 0xcf, 0x5e, 0xa5, 0x84, 0x8a, 0xe6, 0x28, 0x4a, 0x9a, 0xb1, 0x8d,
0x5e, 0xc0, 0x72, 0x7e, 0x7e, 0xca, 0x39, 0x65, 0x76, 0x49, 0x36, 0xc4, 0x83, 0xd9, 0x86, 0x30,
0x93, 0xf2, 0xa6, 0x62, 0x9e, 0x25, 0x9c, 0x8e, 0x82, 0x69, 0x1e, 0xd1, 0x0b, 0x07, 0x98, 0x31,
0x91, 0xa1, 0x12, 0x32, 0x37, 0x45, 0x3a, 0x5f, 0x53, 0x92, 0x70, 0x9c, 0xf4, 0xa5, 0x90, 0xb5,
0x60, 0x6c, 0x8b, 0x74, 0xf2, 0xb3, 0x4a, 0xa7, 0x72, 0xad, 0x74, 0xa6, 0x62, 0x74, 0x3a, 0x53,
0x3e, 0xb4, 0x05, 0x4b, 0xdb, 0x61, 0xef, 0x25, 0x96, 0x9a, 0xd5, 0x37, 0xd7, 0x66, 0x09, 0xe5,
0xbf, 0xbf, 0x95, 0x22, 0xb1, 0x76, 0x49, 0xb4, 0x4f, 0xa0, 0x42, 0x9c, 0x27, 0x80, 0x66, 0xef,
0x2b, 0x74, 0x39, 0xc1, 0xa3, 0x5c, 0x97, 0x13, 0x3c, 0x12, 0x4d, 0x7e, 0x1a, 0xc6, 0x99, 0x6a,
0xfe, 0x5a, 0xa0, 0x8c, 0xad, 0xc2, 0x23, 0x4b, 0x30, 0xcc, 0xa6, 0x78, 0x13, 0x06, 0xf7, 0x8d,
0x05, 0x0d, 0x33, 0x43, 0xf4, 0x11, 0xd4, 0x54, 0x52, 0x93, 0xe6, 0x98, 0x38, 0x44, 0x97, 0xed,
0x0c, 0xb5, 0xc1, 0xec, 0x82, 0x7c, 0x11, 0x0c, 0x0f, 0xfa, 0x0e, 0xea, 0x0a, 0xac, 0xaa, 0x5c,
0x94, 0x55, 0xf6, 0xaf, 0x2e, 0x8a, 0x67, 0x44, 0xa8, 0x1a, 0x9b, 0x1c, 0xce, 0x63, 0x58, 0xbd,
0x08, 0xb8, 0xd1, 0x0d, 0x7f, 0xb7, 0x60, 0x59, 0x8b, 0xaa, 0x5f, 0xa9, 0x30, 0x67, 0xc4, 0x34,
0xf7, 0xe9, 0xf7, 0xea, 0xe1, 0xa5, 0xfd, 0xa0, 0x60, 0xde, 0xc5, 0x38, 0x95, 0xef, 0x0c, 0x9d,
0xb3, 0x0d, 0x1f, 0xcc, 0x85, 0xde, 0x28, 0xf3, 0x4f, 0x60, 0xf9, 0x80, 0x87, 0x3c, 0x63, 0x97,
0xfe, 0x64, 0xdd, 0xdf, 0x2c, 0x58, 0xc9, 0x31, 0xfa, 0x76, 0x5f, 0x42, 0xf5, 0x14, 0x53, 0x8e,
0x5f, 0x61, 0xa6, 0x6f, 0x65, 0xcf, 0xde, 0xea, 0x7b, 0x89, 0x08, 0xc6, 0x48, 0xb4, 0x05, 0x55,
0x26, 0x79, 0xb0, 0x92, 0x75, 0x6e, 0x2b, 0xab, 0x28, 0xfd, 0xbd, 0x31, 0x1e, 0xf9, 0x50, 0x8a,
0xc9, 0x20, 0x57, 0xfb, 0xc3, 0xcb, 0xe2, 0xf6, 0xc8, 0x20, 0x90, 0x40, 0xf7, 0xac, 0x00, 0x65,
0xe5, 0x43, 0xbb, 0x50, 0xee, 0x47, 0x03, 0xcc, 0xb8, 0xba, 0x55, 0x7b, 0x53, 0xfc, 0x40, 0xfe,
0x3a, 0x5b, 0xbf, 0x6b, 0x4c, 0x3d, 0x92, 0xe2, 0x44, 0xcc, 0xe8, 0x30, 0x4a, 0x30, 0x65, 0xfe,
0x80, 0xdc, 0x57, 0x21, 0x5e, 0x47, 0xfe, 0x09, 0x34, 0x83, 0xe0, 0x8a, 0x92, 0x34, 0xe3, 0xba,
0x31, 0x6f, 0xc7, 0xa5, 0x18, 0xc4, 0x08, 0x49, 0xc2, 0x21, 0xd6, 0xef, 0x9a, 0x3c, 0x8b, 0x11,
0xd2, 0x13, 0x7d, 0xdb, 0x97, 0x83, 0xa5, 0x1a, 0x68, 0x0b, 0x6d, 0x41, 0x85, 0xf1, 0x90, 0x72,
0xdc, 0x97, 0x4f, 0xd2, 0x75, 0xde, 0xfe, 0x3c, 0x00, 0x3d, 0x86, 0x5a, 0x8f, 0x0c, 0xd3, 0x18,
0x8b, 0xe8, 0xf2, 0x35, 0xa3, 0x27, 0x21, 0xa2, 0x7b, 0x30, 0xa5, 0x84, 0xca, 0xa9, 0x53, 0x0b,
0x94, 0xe1, 0xfe, 0x57, 0x80, 0x86, 0x29, 0xd6, 0xcc, 0x44, 0xdd, 0x85, 0xb2, 0x92, 0x5e, 0x75,
0xdd, 0xed, 0x4a, 0xa5, 0x18, 0xe6, 0x96, 0xca, 0x86, 0x4a, 0x2f, 0xa3, 0x72, 0xdc, 0xaa, 0x21,
0x9c, 0x9b, 0x22, 0x61, 0x4e, 0x78, 0x18, 0xcb, 0x52, 0x15, 0x03, 0x65, 0x88, 0x29, 0x3c, 0xde,
0x92, 0x6e, 0x36, 0x85, 0xc7, 0x61, 0xa6, 0x0c, 0x95, 0xb7, 0x92, 0xa1, 0x7a, 0x63, 0x19, 0xdc,
0x3f, 0x2c, 0xa8, 0x8d, 0xbb, 0xdc, 0xa8, 0xae, 0xf5, 0xd6, 0xd5, 0x9d, 0xaa, 0x4c, 0xe1, 0x76,
0x95, 0xb9, 0x03, 0x65, 0xc6, 0x29, 0x0e, 0x87, 0x52, 0xa3, 0x62, 0xa0, 0x2d, 0xf1, 0x9e, 0x0c,
0xd9, 0x40, 0x2a, 0xd4, 0x08, 0xc4, 0xd1, 0x75, 0xa1, 0xd1, 0x1e, 0x71, 0xcc, 0xf6, 0x31, 0x13,
0xcb, 0x87, 0xd0, 0xb6, 0x1f, 0xf2, 0x50, 0xde, 0xa3, 0x11, 0xc8, 0xb3, 0x7b, 0x0f, 0xd0, 0x5e,
0xc4, 0xf8, 0x0b, 0xb9, 0x73, 0xb2, 0x45, 0x7b, 0xe2, 0x01, 0xbc, 0x37, 0x85, 0xd6, 0xaf, 0xd4,
0x57, 0x17, 0x36, 0xc5, 0xcf, 0x66, 0x5f, 0x0d, 0xb9, 0xda, 0x7a, 0x2a, 0x70, 0x7a, 0x61, 0xdc,
0xfc, 0xb7, 0x08, 0x95, 0x6d, 0xb5, 0xb5, 0xa3, 0x43, 0xa8, 0x8d, 0x17, 0x51, 0xe4, 0xce, 0xd2,
0x5c, 0xdc, 0x68, 0x9d, 0x4f, 0xaf, 0xc4, 0xe8, 0xfc, 0xbe, 0x81, 0x25, 0xb9, 0x44, 0xa3, 0x39,
0xcf, 0xa0, 0xb9, 0x5d, 0x3b, 0x57, 0xaf, 0xb8, 0x1b, 0x96, 0x60, 0x92, 0x33, 0x64, 0x1e, 0x93,
0xb9, 0x6c, 0x38, 0xeb, 0x0b, 0x86, 0x0f, 0xda, 0x87, 0xb2, 0xfe, 0x39, 0xcf, 0x83, 0x9a, 0x93,
0xc2, 0x69, 0x5e, 0x0e, 0x50, 0x64, 0x1b, 0x16, 0xda, 0x1f, 0x6f, 0x52, 0xf3, 0x52, 0x33, 0xdb,
0xc0, 0x59, 0xf0, 0xff, 0x96, 0xb5, 0x61, 0xa1, 0x1f, 0xa0, 0x6e, 0x08, 0x8d, 0xe6, 0x08, 0x3a,
0xdb, 0x35, 0xce, 0xe7, 0x0b, 0x50, 0x2a, 0xd9, 0x76, 0xe3, 0xf5, 0xf9, 0x9a, 0xf5, 0xe7, 0xf9,
0x9a, 0xf5, 0xf7, 0xf9, 0x9a, 0xd5, 0x2d, 0xcb, 0xbe, 0xff, 0xe2, 0xff, 0x00, 0x00, 0x00, 0xff,
0xff, 0x7e, 0x7b, 0xd6, 0x43, 0xb9, 0x0d, 0x00, 0x00,
}

1
api/services/control/control.proto
View File

@ -26,6 +26,7 @@ service Control {
message PruneRequest {
repeated string filter = 1; // FIXME: not implemented
bool all = 2;
}
message DiskUsageRequest {

11
cache/manager.go vendored
View File

@ -305,10 +305,10 @@ func (cm *cacheManager) Prune(ctx context.Context, ch chan client.UsageInfo, opt
return err
}
return cm.prune(ctx, ch, filter)
return cm.prune(ctx, ch, filter, opt.All)
}
func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, filter filters.Filter) error {
func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, filter filters.Filter, all bool) error {
var toDelete []*cacheRecord
cm.mu.Lock()
@ -332,6 +332,11 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, fil
recordType = client.UsageRecordTypeRegular
}
if !all && (recordType == client.UsageRecordTypeInternal || recordType == client.UsageRecordTypeFrontend) {
cr.mu.Unlock()
continue
}
c := &client.UsageInfo{
ID: cr.ID(),
Mutable: cr.mutable,
@ -414,7 +419,7 @@ func (cm *cacheManager) prune(ctx context.Context, ch chan client.UsageInfo, fil
case <-ctx.Done():
return ctx.Err()
default:
return cm.prune(ctx, ch, filter)
return cm.prune(ctx, ch, filter, all)
}
}

4
client/client_test.go
View File

@ -781,7 +781,7 @@ func testBasicCacheImportExport(t *testing.T, sb integration.Sandbox) {
dt, err = ioutil.ReadFile(filepath.Join(destDir, "unique"))
require.NoError(t, err)
err = c.Prune(context.TODO(), nil)
err = c.Prune(context.TODO(), nil, PruneAll)
require.NoError(t, err)
checkAllRemoved(t, c, sb)
@ -1243,7 +1243,7 @@ loop0:
break
}
err := c.Prune(context.TODO(), nil)
err := c.Prune(context.TODO(), nil, PruneAll)
require.NoError(t, err)
du, err := c.DiskUsage(context.TODO())

14
client/prune.go
View File

@ -15,6 +15,9 @@ func (c *Client) Prune(ctx context.Context, ch chan UsageInfo, opts ...PruneOpti
}
req := &controlapi.PruneRequest{Filter: info.Filter}
if info.All {
req.All = true
}
cl, err := c.controlClient().Prune(ctx, req)
if err != nil {
return errors.Wrap(err, "failed to call prune")
@ -50,4 +53,15 @@ type PruneOption interface {
type PruneInfo struct {
Filter []string
All bool
}
type pruneOptionFunc func(*PruneInfo)
func (f pruneOptionFunc) SetPruneOption(pi *PruneInfo) {
f(pi)
}
var PruneAll = pruneOptionFunc(func(pi *PruneInfo) {
pi.All = true
})

12
cmd/buildctl/prune.go
View File

@ -19,6 +19,10 @@ var pruneCommand = cli.Command{
Name: "filter, f",
Usage: "Filter records",
},
cli.BoolFlag{
Name: "all",
Usage: "Include internal/frontend references",
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Verbose output",
@ -56,7 +60,13 @@ func prune(clicontext *cli.Context) error {
}
}()
err = c.Prune(commandContext(clicontext), ch, client.WithFilter(clicontext.StringSlice("filter")))
opts := []client.PruneOption{client.WithFilter(clicontext.StringSlice("filter"))}
if clicontext.Bool("all") {
opts = append(opts, client.PruneAll)
}
err = c.Prune(commandContext(clicontext), ch, opts...)
close(ch)
<-printed
if err != nil {

1
control/control.go
View File

@ -120,6 +120,7 @@ func (c *Controller) Prune(req *controlapi.PruneRequest, stream controlapi.Contr
eg.Go(func() error {
return w.Prune(ctx, ch, client.PruneInfo{
Filter: req.Filter,
All: req.All,
})
})
}(w)

14
frontend/dockerfile/dockerfile_test.go
View File

@ -2138,7 +2138,7 @@ COPY --from=base unique /
dt, err = ioutil.ReadFile(filepath.Join(destDir, "unique"))
require.NoError(t, err)
err = c.Prune(context.TODO(), nil)
err = c.Prune(context.TODO(), nil, client.PruneAll)
require.NoError(t, err)
checkAllRemoved(t, c, sb)
@ -2300,22 +2300,22 @@ RUN echo bar > bar
},
}
client, err := containerd.New(cdAddress)
ctd, err := containerd.New(cdAddress)
require.NoError(t, err)
defer client.Close()
defer ctd.Close()
ctx := namespaces.WithNamespace(context.Background(), "buildkit")
_, err = c.Solve(context.TODO(), nil, opt, nil)
require.NoError(t, err)
img, err := client.ImageService().Get(ctx, target)
img, err := ctd.ImageService().Get(ctx, target)
require.NoError(t, err)
err = client.ImageService().Delete(ctx, target)
err = ctd.ImageService().Delete(ctx, target)
require.NoError(t, err)
err = c.Prune(context.TODO(), nil)
err = c.Prune(context.TODO(), nil, client.PruneAll)
require.NoError(t, err)
checkAllRemoved(t, c, sb)
@ -2328,7 +2328,7 @@ RUN echo bar > bar
_, err = c.Solve(context.TODO(), nil, opt, nil)
require.NoError(t, err)
img2, err := client.ImageService().Get(ctx, target2)
img2, err := ctd.ImageService().Get(ctx, target2)
require.NoError(t, err)
require.Equal(t, img.Target, img2.Target)