github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

api/types: consolidate types package

Browse Source 
To simplify use of types, we have consolidate the packages for the mount
and descriptor protobuf types into a single Go package. We also drop the
versioning from the type packages, as these types will remain the same
between versions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-06-22 19:51:26 -07:00
parent 40f2627ce1
commit 12c0daa9c9
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
26 changed files with 496 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
api/services/containers/v1/containers.pb.go
View File

@ -30,7 +30,7 @@ import google_protobuf1 "github.com/gogo/protobuf/types"
import google_protobuf2 "github.com/golang/protobuf/ptypes/empty" import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
import google_protobuf3 "github.com/gogo/protobuf/types" import google_protobuf3 "github.com/gogo/protobuf/types"
import _ "github.com/gogo/protobuf/types" import _ "github.com/gogo/protobuf/types"
import _ "github.com/containerd/containerd/api/types/descriptor" import _ "github.com/containerd/containerd/api/types"
import time "time" import time "time"
@ -2549,53 +2549,53 @@ func init() {
} }
var fileDescriptorContainers = []byte{ var fileDescriptorContainers = []byte{
// 758 bytes of a gzipped FileDescriptorProto // 756 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x72, 0xda, 0x48, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x72, 0x12, 0x4b,
0x10, 0xb6, 0x00, 0x0b, 0xd3, 0xec, 0x61, 0x6b, 0x96, 0x65, 0xb5, 0xda, 0x2a, 0x60, 0x39, 0x71, 0x14, 0xce, 0x00, 0x19, 0xc2, 0xe1, 0x2e, 0x6e, 0xf5, 0xe5, 0x72, 0xe7, 0x8e, 0x55, 0x80, 0xac,
0xd8, 0x95, 0x62, 0x92, 0x4a, 0xfc, 0x73, 0x02, 0xdb, 0xb8, 0x52, 0xe5, 0x24, 0xae, 0x49, 0x72, 0x58, 0xe8, 0x8c, 0x41, 0x4b, 0xf3, 0xb3, 0x82, 0xfc, 0x95, 0x55, 0x51, 0x53, 0xad, 0x6e, 0xcc,
0x89, 0x0f, 0x8e, 0x80, 0x01, 0x2b, 0x08, 0x8d, 0xa2, 0x19, 0xa8, 0xa2, 0x72, 0x48, 0x1e, 0x21, 0x22, 0x0e, 0xd0, 0x90, 0x91, 0x61, 0x7a, 0x9c, 0x6e, 0xa8, 0xa2, 0x5c, 0xe8, 0x23, 0xf8, 0x16,
0x6f, 0xe1, 0x37, 0xc8, 0x33, 0xf8, 0x98, 0x63, 0x4e, 0x8e, 0xcd, 0x93, 0xa4, 0x34, 0x1a, 0x59, 0x79, 0x03, 0x9f, 0x21, 0x4b, 0x97, 0xae, 0x62, 0xc2, 0x93, 0x58, 0xd3, 0xd3, 0x93, 0x41, 0x20,
0x04, 0x70, 0x05, 0x48, 0x7c, 0xeb, 0x76, 0xf7, 0xf7, 0x75, 0xcf, 0xd7, 0xdd, 0x58, 0x70, 0xd4, 0x25, 0xa0, 0xd9, 0xf5, 0xe1, 0x9c, 0xef, 0x3b, 0xa7, 0xbf, 0x73, 0xce, 0xd0, 0x70, 0xd8, 0xb1,
0xb5, 0xf9, 0xd9, 0xa0, 0x69, 0xb4, 0x68, 0xdf, 0x6c, 0x51, 0x97, 0x5b, 0xb6, 0x4b, 0xfc, 0xf6, 0xf9, 0x69, 0xbf, 0x61, 0x34, 0x69, 0xcf, 0x6c, 0x52, 0x97, 0x5b, 0xb6, 0x4b, 0xfc, 0xd6, 0xf8,
0xa4, 0x69, 0x79, 0xb6, 0xc9, 0x88, 0x3f, 0xb4, 0x5b, 0x84, 0xc5, 0x7f, 0x67, 0xe6, 0x70, 0x73, 0xd1, 0xf2, 0x6c, 0x93, 0x11, 0x7f, 0x60, 0x37, 0x09, 0x8b, 0x7f, 0x67, 0xe6, 0x60, 0x7d, 0xcc,
0xc2, 0x33, 0x3c, 0x9f, 0x72, 0x8a, 0xfe, 0x8d, 0x71, 0x46, 0x84, 0x31, 0x26, 0xb2, 0x86, 0x9b, 0x32, 0x3c, 0x9f, 0x72, 0x8a, 0xee, 0xc6, 0x38, 0x23, 0xc2, 0x18, 0x63, 0x51, 0x83, 0x75, 0x3d,
0x7a, 0xae, 0x4b, 0xbb, 0x54, 0x64, 0x9b, 0x81, 0x15, 0x02, 0xf5, 0xbf, 0xbb, 0x94, 0x76, 0x1d, 0xd7, 0xa1, 0x1d, 0x2a, 0xa2, 0xcd, 0xe0, 0x14, 0x02, 0xf5, 0xff, 0x3b, 0x94, 0x76, 0x1c, 0x62,
0x62, 0x0a, 0xaf, 0x39, 0xe8, 0x98, 0x96, 0x3b, 0x92, 0xa1, 0x7f, 0xa6, 0x43, 0xa4, 0xef, 0xf1, 0x0a, 0xab, 0xd1, 0x6f, 0x9b, 0x96, 0x3b, 0x94, 0xae, 0x3b, 0x93, 0x2e, 0xd2, 0xf3, 0x78, 0xe4,
0x28, 0x58, 0x9a, 0x0e, 0x76, 0x6c, 0xe2, 0xb4, 0x4f, 0xfb, 0x16, 0xeb, 0xc9, 0x8c, 0xe2, 0x74, 0x2c, 0x4d, 0x3a, 0xdb, 0x36, 0x71, 0x5a, 0x27, 0x3d, 0x8b, 0x75, 0x65, 0x44, 0x71, 0x32, 0x82,
0x06, 0xb7, 0xfb, 0x84, 0x71, 0xab, 0xef, 0xc9, 0x84, 0xc6, 0x42, 0x0a, 0xf0, 0x91, 0x47, 0x98, 0xdb, 0x3d, 0xc2, 0xb8, 0xd5, 0xf3, 0x64, 0xc0, 0xf6, 0x5c, 0x0a, 0xf0, 0xa1, 0x47, 0x98, 0xd9,
0xd9, 0x26, 0xac, 0xe5, 0xdb, 0x1e, 0xa7, 0xfe, 0x84, 0x19, 0xf2, 0x94, 0xcf, 0xd7, 0x21, 0xb3, 0x22, 0xac, 0xe9, 0xdb, 0x1e, 0xa7, 0x7e, 0x08, 0x2e, 0x9f, 0xad, 0x42, 0x66, 0x27, 0x8a, 0x44,
0x17, 0x81, 0x50, 0x1e, 0x12, 0x76, 0x5b, 0x53, 0x4a, 0x4a, 0x25, 0x53, 0x57, 0xc7, 0x97, 0xc5, 0x79, 0x48, 0xd8, 0x2d, 0x4d, 0x29, 0x29, 0x95, 0x4c, 0x5d, 0x1d, 0x5d, 0x14, 0x13, 0x4f, 0x77,
0xc4, 0xe3, 0x7d, 0x9c, 0xb0, 0xdb, 0xe8, 0x18, 0x54, 0xc7, 0x6a, 0x12, 0x87, 0x69, 0x89, 0x52, 0x71, 0xc2, 0x6e, 0xa1, 0x23, 0x50, 0x1d, 0xab, 0x41, 0x1c, 0xa6, 0x25, 0x4a, 0xc9, 0x4a, 0xb6,
0xb2, 0x92, 0xad, 0x6e, 0x19, 0x3f, 0x94, 0xcc, 0xb8, 0x61, 0x35, 0x8e, 0x04, 0xf4, 0xc0, 0xe5, 0xba, 0x61, 0xfc, 0x52, 0x27, 0xe3, 0x9a, 0xd5, 0x38, 0x14, 0xd0, 0x3d, 0x97, 0xfb, 0x43, 0x2c,
0xfe, 0x08, 0x4b, 0x1e, 0x94, 0x83, 0x75, 0xbb, 0x6f, 0x75, 0x89, 0x96, 0x0c, 0x8a, 0xe1, 0xd0, 0x79, 0x50, 0x0e, 0x56, 0xed, 0x9e, 0xd5, 0x21, 0x5a, 0x32, 0x48, 0x86, 0x43, 0x03, 0x3d, 0x87,
0x41, 0x4f, 0x21, 0xed, 0x0f, 0xdc, 0xe0, 0xad, 0x5a, 0xaa, 0xa4, 0x54, 0xb2, 0xd5, 0x07, 0x4b, 0xb4, 0xdf, 0x77, 0x83, 0x0b, 0x6a, 0xa9, 0x92, 0x52, 0xc9, 0x56, 0x1f, 0x2d, 0x94, 0x08, 0x87,
0x15, 0xc2, 0x21, 0x16, 0x47, 0x24, 0xa8, 0x02, 0x29, 0xe6, 0x91, 0x96, 0xb6, 0x2e, 0xc8, 0x72, 0x58, 0x1c, 0x91, 0xa0, 0x0a, 0xa4, 0x98, 0x47, 0x9a, 0xda, 0xaa, 0x20, 0xcb, 0x19, 0xa1, 0x94,
0x46, 0xa8, 0xaa, 0x11, 0xa9, 0x6a, 0xd4, 0xdc, 0x11, 0x16, 0x19, 0xa8, 0x0c, 0xaa, 0x4f, 0x29, 0x46, 0x24, 0xa5, 0x51, 0x73, 0x87, 0x58, 0x44, 0xa0, 0x32, 0xa8, 0x3e, 0xa5, 0xbc, 0xcd, 0x34,
0xef, 0x30, 0x4d, 0x15, 0xaf, 0x87, 0xf1, 0x65, 0x51, 0xc5, 0x94, 0xf2, 0xc6, 0x73, 0x2c, 0x23, 0x55, 0xdc, 0x1e, 0x46, 0x17, 0x45, 0x15, 0x53, 0xca, 0xf7, 0x5f, 0x62, 0xe9, 0x41, 0x3b, 0x00,
0x68, 0x0f, 0xa0, 0xe5, 0x13, 0x8b, 0x93, 0xf6, 0xa9, 0xc5, 0xb5, 0xb4, 0xe0, 0xd4, 0x67, 0x38, 0x4d, 0x9f, 0x58, 0x9c, 0xb4, 0x4e, 0x2c, 0xae, 0xa5, 0x05, 0xa7, 0x3e, 0xc5, 0xf9, 0x2a, 0x6a,
0x5f, 0x44, 0x93, 0xaa, 0x6f, 0x5c, 0x5c, 0x16, 0xd7, 0x3e, 0x7e, 0x2d, 0x2a, 0x38, 0x23, 0x71, 0x4f, 0x7d, 0xed, 0xfc, 0xa2, 0xb8, 0xf2, 0xf9, 0x7b, 0x51, 0xc1, 0x19, 0x89, 0xab, 0xf1, 0x80,
0x35, 0x1e, 0x90, 0x0c, 0xbc, 0x76, 0x44, 0xb2, 0xb1, 0x0c, 0x89, 0xc4, 0xd5, 0xb8, 0xbe, 0x0d, 0xa4, 0xef, 0xb5, 0x22, 0x92, 0xb5, 0x45, 0x48, 0x24, 0xae, 0xc6, 0xf5, 0x4d, 0xc8, 0x8e, 0x89,
0xd9, 0x09, 0x51, 0xd1, 0xef, 0x90, 0xec, 0x91, 0x51, 0x38, 0x37, 0x1c, 0x98, 0x81, 0xbc, 0x43, 0x8a, 0xfe, 0x86, 0x64, 0x97, 0x0c, 0xc3, 0xbe, 0xe1, 0xe0, 0x18, 0xc8, 0x3b, 0xb0, 0x9c, 0x3e,
0xcb, 0x19, 0x10, 0x2d, 0x11, 0xca, 0x2b, 0x9c, 0x9d, 0xc4, 0x96, 0xa2, 0x7f, 0x52, 0x20, 0x2d, 0xd1, 0x12, 0xa1, 0xbc, 0xc2, 0xd8, 0x4a, 0x6c, 0x28, 0xfa, 0x17, 0x05, 0xd2, 0x52, 0x27, 0x84,
0x75, 0x42, 0x08, 0x52, 0xae, 0xd5, 0x27, 0x12, 0x28, 0x6c, 0x74, 0x02, 0x69, 0xea, 0x71, 0x9b, 0x20, 0xe5, 0x5a, 0x3d, 0x22, 0x81, 0xe2, 0x8c, 0x8e, 0x21, 0x4d, 0x3d, 0x6e, 0x53, 0x37, 0xea,
0xba, 0xd1, 0xac, 0x6b, 0xab, 0x8c, 0xc0, 0x78, 0x16, 0x72, 0x84, 0x43, 0x8f, 0x18, 0xf5, 0x1d, 0x75, 0x6d, 0x99, 0x16, 0x18, 0x2f, 0x42, 0x8e, 0xb0, 0xe9, 0x11, 0xa3, 0xbe, 0x05, 0x7f, 0x8d,
0xf8, 0x6d, 0x32, 0xb0, 0x4c, 0xe3, 0xe5, 0xff, 0xe1, 0x8f, 0x43, 0xc2, 0x6f, 0x2a, 0x61, 0xf2, 0x3b, 0x16, 0x29, 0xbc, 0x7c, 0x1f, 0xfe, 0x39, 0x20, 0xfc, 0x3a, 0x13, 0x26, 0xef, 0xfb, 0x84,
0x76, 0x40, 0x18, 0xbf, 0x6d, 0x65, 0xcb, 0x67, 0x90, 0xfb, 0x3e, 0x9d, 0x79, 0xd4, 0x65, 0x04, 0xf1, 0x9b, 0x46, 0xb6, 0x7c, 0x0a, 0xb9, 0x9f, 0xc3, 0x99, 0x47, 0x5d, 0x46, 0xd0, 0x11, 0x64,
0x1d, 0x43, 0xe6, 0xa6, 0x77, 0x01, 0xcb, 0x56, 0xff, 0x5b, 0xe6, 0x85, 0xf5, 0x54, 0x30, 0x10, 0xae, 0x6b, 0x17, 0xb0, 0x6c, 0xf5, 0xde, 0x22, 0x37, 0xac, 0xa7, 0x82, 0x86, 0xe0, 0x98, 0xa4,
0x1c, 0x93, 0x94, 0x4d, 0xf8, 0xf3, 0xc8, 0x66, 0x71, 0x29, 0x16, 0xb7, 0xa6, 0x76, 0x6c, 0x87, 0x6c, 0xc2, 0xbf, 0x87, 0x36, 0x8b, 0x53, 0xb1, 0xb8, 0x34, 0xb5, 0x6d, 0x3b, 0x5c, 0xe6, 0xc9,
0xcb, 0x3a, 0x19, 0x2c, 0xbd, 0xb2, 0x03, 0xf9, 0x69, 0x80, 0x6c, 0x0e, 0x03, 0xc4, 0x65, 0x35, 0x60, 0x69, 0x95, 0x1d, 0xc8, 0x4f, 0x02, 0x64, 0x71, 0x18, 0x20, 0x4e, 0xab, 0x29, 0x42, 0xff,
0x45, 0xe8, 0xbf, 0x4a, 0x77, 0x13, 0x2c, 0xe5, 0x37, 0x90, 0xdf, 0x13, 0xdb, 0x37, 0x23, 0xdd, 0x65, 0xaa, 0x1b, 0x63, 0x29, 0xbf, 0x83, 0xfc, 0x8e, 0x98, 0xbe, 0x29, 0xe9, 0xfe, 0xbc, 0x14,
0xaf, 0x97, 0xa2, 0x07, 0x7f, 0xcd, 0xd4, 0xba, 0x33, 0xdd, 0xcf, 0x15, 0xc8, 0xbf, 0x14, 0x27, 0x5d, 0xf8, 0x6f, 0x2a, 0xd7, 0xad, 0xe9, 0x7e, 0xa6, 0x40, 0xfe, 0xb5, 0x58, 0x89, 0xdb, 0xbf,
0x71, 0xf7, 0x2f, 0x43, 0xbb, 0x90, 0x0d, 0xcf, 0x4f, 0xfc, 0x4a, 0x8b, 0xed, 0x9c, 0x77, 0xb7, 0x19, 0xda, 0x86, 0x6c, 0xb8, 0x7e, 0xe2, 0xd3, 0x2c, 0xa6, 0x73, 0xd6, 0xde, 0xee, 0x07, 0x5f,
0x8d, 0xe0, 0x87, 0xfc, 0x89, 0xc5, 0x7a, 0x58, 0x5e, 0x79, 0x60, 0x07, 0xb2, 0xcc, 0x34, 0x7a, 0xef, 0x67, 0x16, 0xeb, 0x62, 0xb9, 0xe5, 0xc1, 0x39, 0x90, 0x65, 0xaa, 0xd0, 0x5b, 0x93, 0xe5,
0x67, 0xb2, 0xdc, 0x83, 0xfc, 0x3e, 0x71, 0xc8, 0x1c, 0x55, 0x6e, 0x39, 0x95, 0xea, 0x55, 0x0a, 0x01, 0xe4, 0x77, 0x89, 0x43, 0x66, 0xa8, 0x72, 0xc3, 0xaa, 0x54, 0x2f, 0x53, 0x00, 0xf1, 0x30,
0x20, 0x5e, 0x46, 0x34, 0x84, 0xe4, 0x21, 0xe1, 0xe8, 0xe1, 0x02, 0x6d, 0xcc, 0x39, 0x48, 0xfd, 0xa2, 0x01, 0x24, 0x0f, 0x08, 0x47, 0x8f, 0xe7, 0x28, 0x63, 0xc6, 0x42, 0xea, 0x4f, 0x16, 0xc6,
0xd1, 0xd2, 0x38, 0x29, 0xc5, 0x3b, 0x48, 0x05, 0x67, 0x81, 0x16, 0xf9, 0xe7, 0x32, 0xf7, 0xe0, 0x49, 0x29, 0x3e, 0x40, 0x2a, 0x58, 0x0b, 0x34, 0xcf, 0x9f, 0xcb, 0xcc, 0x85, 0xd3, 0x37, 0x97,
0xf4, 0xed, 0x15, 0x90, 0xb2, 0xf8, 0x7b, 0x50, 0xc3, 0xcd, 0x45, 0x8b, 0x90, 0xcc, 0x3f, 0x28, 0x40, 0xca, 0xe4, 0x1f, 0x41, 0x0d, 0x27, 0x17, 0xcd, 0x43, 0x32, 0x7b, 0xa1, 0xf4, 0xad, 0x65,
0x7d, 0x67, 0x15, 0x68, 0xdc, 0x40, 0xb8, 0x23, 0x0b, 0x35, 0x30, 0x7f, 0xef, 0x17, 0x6a, 0xe0, 0xa0, 0x71, 0x01, 0xe1, 0x8c, 0xcc, 0x55, 0xc0, 0xec, 0xb9, 0x9f, 0xab, 0x80, 0x9b, 0x26, 0xf1,
0xb6, 0x4d, 0x3c, 0x01, 0x35, 0xdc, 0x9b, 0x85, 0x1a, 0x98, 0xbf, 0x62, 0x7a, 0x7e, 0xe6, 0x22, 0x18, 0xd4, 0x70, 0x6e, 0xe6, 0x2a, 0x60, 0xf6, 0x88, 0xe9, 0xf9, 0xa9, 0x8d, 0xd8, 0x0b, 0x1e,
0x0e, 0x82, 0xef, 0x9e, 0xfa, 0xeb, 0x8b, 0xeb, 0xc2, 0xda, 0x97, 0xeb, 0xc2, 0xda, 0x87, 0x71, 0x3b, 0xf5, 0xb7, 0xe7, 0x57, 0x85, 0x95, 0x6f, 0x57, 0x85, 0x95, 0x4f, 0xa3, 0x82, 0x72, 0x3e,
0x41, 0xb9, 0x18, 0x17, 0x94, 0xcf, 0xe3, 0x82, 0x72, 0x35, 0x2e, 0x28, 0xaf, 0x1a, 0x3f, 0xf1, 0x2a, 0x28, 0x5f, 0x47, 0x05, 0xe5, 0x72, 0x54, 0x50, 0xde, 0xec, 0xff, 0xc6, 0xfb, 0x6d, 0x3b,
0x29, 0xb7, 0x1b, 0x7b, 0x4d, 0x55, 0x54, 0xbc, 0xff, 0x2d, 0x00, 0x00, 0xff, 0xff, 0x18, 0x2d, 0xb6, 0x1a, 0xaa, 0xc8, 0xf8, 0xf0, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0x4e, 0xa7, 0x59,
0x7b, 0x47, 0x1b, 0x0a, 0x00, 0x00, 0x10, 0x0a, 0x00, 0x00,
} }

2
api/services/containers/v1/containers.proto
View File

@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";
option go_package = "github.com/containerd/containerd/api/services/containers/v1;containers"; option go_package = "github.com/containerd/containerd/api/services/containers/v1;containers";

97
api/services/diff/v1/diff.pb.go
View File

@ -22,8 +22,8 @@ import math "math"
import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/gogo/protobuf/gogoproto"
import _ "github.com/golang/protobuf/ptypes/empty" import _ "github.com/golang/protobuf/ptypes/empty"
import _ "github.com/gogo/protobuf/types" import _ "github.com/gogo/protobuf/types"
import containerd_v1_types "github.com/containerd/containerd/api/types/mount" import containerd_types "github.com/containerd/containerd/api/types"
import containerd_v1_types1 "github.com/containerd/containerd/api/types/descriptor" import containerd_types1 "github.com/containerd/containerd/api/types"
import ( import (
context "golang.org/x/net/context" context "golang.org/x/net/context"
@ -48,8 +48,8 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type ApplyRequest struct { type ApplyRequest struct {
// Diff is the descriptor of the diff to be extracted // Diff is the descriptor of the diff to be extracted
Diff *containerd_v1_types1.Descriptor `protobuf:"bytes,1,opt,name=diff" json:"diff,omitempty"` Diff *containerd_types1.Descriptor `protobuf:"bytes,1,opt,name=diff" json:"diff,omitempty"`
Mounts []*containerd_v1_types.Mount `protobuf:"bytes,2,rep,name=mounts" json:"mounts,omitempty"` Mounts []*containerd_types.Mount `protobuf:"bytes,2,rep,name=mounts" json:"mounts,omitempty"`
} }
func (m *ApplyRequest) Reset() { *m = ApplyRequest{} } func (m *ApplyRequest) Reset() { *m = ApplyRequest{} }
@ -60,7 +60,7 @@ type ApplyResponse struct {
// Applied is the descriptor for the object which was applied. // Applied is the descriptor for the object which was applied.
// If the input was a compressed blob then the result will be // If the input was a compressed blob then the result will be
// the descriptor for the uncompressed blob. // the descriptor for the uncompressed blob.
Applied *containerd_v1_types1.Descriptor `protobuf:"bytes,1,opt,name=applied" json:"applied,omitempty"` Applied *containerd_types1.Descriptor `protobuf:"bytes,1,opt,name=applied" json:"applied,omitempty"`
} }
func (m *ApplyResponse) Reset() { *m = ApplyResponse{} } func (m *ApplyResponse) Reset() { *m = ApplyResponse{} }
@ -70,10 +70,10 @@ func (*ApplyResponse) Descriptor() ([]byte, []int) { return fileDescriptorDiff,
type DiffRequest struct { type DiffRequest struct {
// Left are the mounts which represent the older copy // Left are the mounts which represent the older copy
// in which is the base of the computed changes. // in which is the base of the computed changes.
Left []*containerd_v1_types.Mount `protobuf:"bytes,1,rep,name=left" json:"left,omitempty"` Left []*containerd_types.Mount `protobuf:"bytes,1,rep,name=left" json:"left,omitempty"`
// Right are the mounts which represents the newer copy // Right are the mounts which represents the newer copy
// in which changes from the left were made into. // in which changes from the left were made into.
Right []*containerd_v1_types.Mount `protobuf:"bytes,2,rep,name=right" json:"right,omitempty"` Right []*containerd_types.Mount `protobuf:"bytes,2,rep,name=right" json:"right,omitempty"`
// MediaType is the media type descriptor for the created diff // MediaType is the media type descriptor for the created diff
// object // object
MediaType string `protobuf:"bytes,3,opt,name=media_type,json=mediaType,proto3" json:"media_type,omitempty"` MediaType string `protobuf:"bytes,3,opt,name=media_type,json=mediaType,proto3" json:"media_type,omitempty"`
@ -88,7 +88,7 @@ func (*DiffRequest) Descriptor() ([]byte, []int) { return fileDescriptorDiff, []
type DiffResponse struct { type DiffResponse struct {
// Diff is the descriptor of the diff which can be applied // Diff is the descriptor of the diff which can be applied
Diff *containerd_v1_types1.Descriptor `protobuf:"bytes,3,opt,name=diff" json:"diff,omitempty"` Diff *containerd_types1.Descriptor `protobuf:"bytes,3,opt,name=diff" json:"diff,omitempty"`
} }
func (m *DiffResponse) Reset() { *m = DiffResponse{} } func (m *DiffResponse) Reset() { *m = DiffResponse{} }
@ -474,8 +474,8 @@ func (this *ApplyRequest) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ApplyRequest{`, s := strings.Join([]string{`&ApplyRequest{`,
`Diff:` + strings.Replace(fmt.Sprintf("%v", this.Diff), "Descriptor", "containerd_v1_types1.Descriptor", 1) + `,`, `Diff:` + strings.Replace(fmt.Sprintf("%v", this.Diff), "Descriptor", "containerd_types1.Descriptor", 1) + `,`,
`Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_types.Mount", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -485,7 +485,7 @@ func (this *ApplyResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ApplyResponse{`, s := strings.Join([]string{`&ApplyResponse{`,
`Applied:` + strings.Replace(fmt.Sprintf("%v", this.Applied), "Descriptor", "containerd_v1_types1.Descriptor", 1) + `,`, `Applied:` + strings.Replace(fmt.Sprintf("%v", this.Applied), "Descriptor", "containerd_types1.Descriptor", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -495,8 +495,8 @@ func (this *DiffRequest) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&DiffRequest{`, s := strings.Join([]string{`&DiffRequest{`,
`Left:` + strings.Replace(fmt.Sprintf("%v", this.Left), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Left:` + strings.Replace(fmt.Sprintf("%v", this.Left), "Mount", "containerd_types.Mount", 1) + `,`,
`Right:` + strings.Replace(fmt.Sprintf("%v", this.Right), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Right:` + strings.Replace(fmt.Sprintf("%v", this.Right), "Mount", "containerd_types.Mount", 1) + `,`,
`MediaType:` + fmt.Sprintf("%v", this.MediaType) + `,`, `MediaType:` + fmt.Sprintf("%v", this.MediaType) + `,`,
`Ref:` + fmt.Sprintf("%v", this.Ref) + `,`, `Ref:` + fmt.Sprintf("%v", this.Ref) + `,`,
`}`, `}`,
@ -508,7 +508,7 @@ func (this *DiffResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&DiffResponse{`, s := strings.Join([]string{`&DiffResponse{`,
`Diff:` + strings.Replace(fmt.Sprintf("%v", this.Diff), "Descriptor", "containerd_v1_types1.Descriptor", 1) + `,`, `Diff:` + strings.Replace(fmt.Sprintf("%v", this.Diff), "Descriptor", "containerd_types1.Descriptor", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -577,7 +577,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Diff == nil { if m.Diff == nil {
m.Diff = &containerd_v1_types1.Descriptor{} m.Diff = &containerd_types1.Descriptor{}
} }
if err := m.Diff.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Diff.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
@ -609,7 +609,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Mounts = append(m.Mounts, &containerd_v1_types.Mount{}) m.Mounts = append(m.Mounts, &containerd_types.Mount{})
if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -691,7 +691,7 @@ func (m *ApplyResponse) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Applied == nil { if m.Applied == nil {
m.Applied = &containerd_v1_types1.Descriptor{} m.Applied = &containerd_types1.Descriptor{}
} }
if err := m.Applied.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Applied.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
@ -773,7 +773,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Left = append(m.Left, &containerd_v1_types.Mount{}) m.Left = append(m.Left, &containerd_types.Mount{})
if err := m.Left[len(m.Left)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Left[len(m.Left)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -804,7 +804,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Right = append(m.Right, &containerd_v1_types.Mount{}) m.Right = append(m.Right, &containerd_types.Mount{})
if err := m.Right[len(m.Right)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Right[len(m.Right)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -944,7 +944,7 @@ func (m *DiffResponse) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Diff == nil { if m.Diff == nil {
m.Diff = &containerd_v1_types1.Descriptor{} m.Diff = &containerd_types1.Descriptor{}
} }
if err := m.Diff.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Diff.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
@ -1081,33 +1081,32 @@ func init() {
} }
var fileDescriptorDiff = []byte{ var fileDescriptorDiff = []byte{
// 434 bytes of a gzipped FileDescriptorProto // 427 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xbf, 0x6f, 0xd4, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0xd4, 0x30,
0x14, 0xc7, 0x6b, 0xee, 0xae, 0xa8, 0xbe, 0x22, 0x21, 0x8b, 0x21, 0x4a, 0x45, 0x7a, 0xba, 0xe9, 0x14, 0xc7, 0x6b, 0xee, 0xae, 0xa8, 0xbe, 0x22, 0x21, 0x0b, 0x89, 0xe8, 0x0a, 0xe1, 0x94, 0x29,
0xca, 0x60, 0x73, 0xe9, 0xc4, 0x8f, 0x81, 0x1f, 0x15, 0x03, 0x12, 0x4b, 0xd4, 0x09, 0x24, 0x50, 0x05, 0x61, 0xd3, 0x43, 0xea, 0x40, 0x97, 0x82, 0x2a, 0x31, 0xb1, 0x44, 0x9d, 0x40, 0x02, 0xe5,
0x2e, 0x79, 0x49, 0x2d, 0x25, 0xb1, 0x89, 0x9d, 0xa0, 0x6c, 0xfc, 0x29, 0xfc, 0x2f, 0x2c, 0x1d, 0x92, 0x97, 0xd4, 0x52, 0x12, 0xbb, 0xb1, 0x73, 0x52, 0x36, 0x3e, 0x07, 0x5f, 0x87, 0xa5, 0x23,
0x19, 0x19, 0x69, 0xfe, 0x12, 0x14, 0xc7, 0x81, 0x08, 0xa1, 0x92, 0xb2, 0xc4, 0x2f, 0x7e, 0x9f, 0x23, 0x23, 0x97, 0x4f, 0x82, 0xe2, 0x38, 0x10, 0x81, 0x74, 0x84, 0x4e, 0x7e, 0xf1, 0xfb, 0xfd,
0xf7, 0xfc, 0x7d, 0xdf, 0x38, 0xf8, 0x59, 0xca, 0xf5, 0x45, 0xb5, 0xa3, 0x91, 0xc8, 0x59, 0x24, 0xdf, 0xfb, 0xfb, 0xc5, 0xc6, 0xe7, 0x29, 0xd7, 0x57, 0xd5, 0x9a, 0x46, 0x22, 0x67, 0x91, 0x28,
0x0a, 0x1d, 0xf2, 0x02, 0xca, 0x78, 0x1c, 0x86, 0x92, 0x33, 0x05, 0x65, 0xcd, 0x23, 0x50, 0x2c, 0x74, 0xc8, 0x0b, 0x28, 0xe3, 0x61, 0x18, 0x4a, 0xce, 0x14, 0x94, 0x1b, 0x1e, 0x81, 0x62, 0x31,
0xe6, 0x49, 0xc2, 0xea, 0xad, 0x59, 0xa9, 0x2c, 0x85, 0x16, 0xe4, 0xe8, 0x37, 0x4b, 0x07, 0x8e, 0x4f, 0x12, 0xb6, 0x39, 0x31, 0x2b, 0x95, 0xa5, 0xd0, 0x82, 0x1c, 0xfd, 0x66, 0x69, 0xcf, 0x51,
0x9a, 0x7c, 0xbd, 0x75, 0xef, 0xa5, 0x22, 0x15, 0x86, 0x63, 0x5d, 0xd4, 0x97, 0xb8, 0x47, 0xa9, 0x93, 0xdf, 0x9c, 0x2c, 0x1e, 0xa4, 0x22, 0x15, 0x86, 0x63, 0x6d, 0xd4, 0x49, 0x16, 0x47, 0xa9,
0x10, 0x69, 0x06, 0xcc, 0xbc, 0xed, 0xaa, 0x84, 0x41, 0x2e, 0x75, 0x63, 0x93, 0xc7, 0x7f, 0x26, 0x10, 0x69, 0x06, 0xcc, 0x7c, 0xad, 0xab, 0x84, 0x41, 0x2e, 0x75, 0x6d, 0x93, 0x4f, 0xfe, 0x4c,
0x35, 0xcf, 0x41, 0xe9, 0x30, 0x97, 0x16, 0x78, 0x3a, 0x49, 0xb2, 0x6e, 0x24, 0x28, 0x96, 0x8b, 0x6a, 0x9e, 0x83, 0xd2, 0x61, 0x2e, 0x2d, 0x70, 0x3a, 0xca, 0xb2, 0xae, 0x25, 0x28, 0x96, 0x8b,
0xaa, 0xd0, 0xfd, 0xd3, 0x56, 0xbf, 0xba, 0x41, 0x75, 0x0c, 0x2a, 0x2a, 0xb9, 0xd4, 0xa2, 0x1c, 0xaa, 0xd0, 0x56, 0x77, 0xf6, 0x1f, 0xba, 0x18, 0x54, 0x54, 0x72, 0xa9, 0x45, 0xd9, 0x89, 0xbd,
0x85, 0x7d, 0x9f, 0xf5, 0x27, 0x7c, 0xf8, 0x5c, 0xca, 0xac, 0x09, 0xe0, 0x63, 0x05, 0x4a, 0x93, 0x6b, 0x7c, 0xf8, 0x5a, 0xca, 0xac, 0x0e, 0xe0, 0xba, 0x02, 0xa5, 0xc9, 0x0b, 0x3c, 0x6d, 0xcf,
0x53, 0x3c, 0xef, 0x86, 0x76, 0xd0, 0x0a, 0x6d, 0x96, 0xfe, 0x31, 0x1d, 0xb9, 0x52, 0x6f, 0xa9, 0xe8, 0xa0, 0x25, 0xf2, 0xe7, 0xab, 0x47, 0x74, 0x30, 0x04, 0x53, 0x81, 0x5e, 0xfc, 0xaa, 0x10,
0xe9, 0x47, 0xcf, 0x7e, 0x35, 0x09, 0x0c, 0x4c, 0x7c, 0xbc, 0x6f, 0xb4, 0x29, 0xe7, 0xd6, 0x6a, 0x18, 0x92, 0x30, 0xbc, 0x6f, 0xdc, 0x28, 0xe7, 0xce, 0x72, 0xe2, 0xcf, 0x57, 0x0f, 0xff, 0xd6,
0xb6, 0x59, 0xfa, 0xee, 0x5f, 0xcb, 0xde, 0x74, 0x48, 0x60, 0xc9, 0xf5, 0x6b, 0x7c, 0xc7, 0x1e, 0xbc, 0x6b, 0xf3, 0x81, 0xc5, 0xbc, 0xb7, 0xf8, 0x9e, 0x6d, 0xa9, 0xa4, 0x28, 0x14, 0x90, 0x53,
0xac, 0xa4, 0x28, 0x14, 0x90, 0x47, 0xf8, 0x76, 0x28, 0x65, 0xc6, 0x21, 0x9e, 0x7a, 0xf8, 0xc0, 0x7c, 0x37, 0x94, 0x32, 0xe3, 0x10, 0x8f, 0x6a, 0xdb, 0xc3, 0xde, 0x17, 0x84, 0xe7, 0x17, 0x3c,
0xaf, 0xbf, 0x20, 0xbc, 0x3c, 0xe3, 0x49, 0x32, 0x0c, 0x41, 0xf1, 0x3c, 0x83, 0x44, 0x3b, 0xe8, 0x49, 0x7a, 0xef, 0xcf, 0xf0, 0x34, 0x83, 0x44, 0x3b, 0x68, 0xb7, 0x0f, 0x03, 0x91, 0xe7, 0x78,
0x9f, 0x6a, 0x0c, 0x47, 0x1e, 0xe2, 0x45, 0xc9, 0xd3, 0x0b, 0x3d, 0x41, 0x7e, 0x0f, 0x92, 0xfb, 0x56, 0xf2, 0xf4, 0x4a, 0xff, 0xcb, 0x75, 0x47, 0x91, 0xc7, 0x18, 0xe7, 0x10, 0xf3, 0xf0, 0x53,
0x18, 0xe7, 0x10, 0xf3, 0xf0, 0x43, 0x97, 0x73, 0x66, 0x2b, 0xb4, 0x39, 0x08, 0x0e, 0xcc, 0xce, 0x9b, 0x73, 0x26, 0x4b, 0xe4, 0x1f, 0x04, 0x07, 0x66, 0xe7, 0xb2, 0x96, 0x40, 0xee, 0xe3, 0x49,
0x79, 0x23, 0x81, 0xdc, 0xc5, 0xb3, 0x12, 0x12, 0x67, 0x61, 0xf6, 0xbb, 0x70, 0xfd, 0x12, 0x1f, 0x09, 0x89, 0x33, 0x33, 0xfb, 0x6d, 0xe8, 0x9d, 0xe3, 0xc3, 0xce, 0x9b, 0x3d, 0x64, 0x3f, 0xd8,
0xf6, 0x0a, 0xed, 0xb4, 0x83, 0xcf, 0xb3, 0x1b, 0xf8, 0xec, 0x7f, 0x45, 0x78, 0xde, 0x75, 0x21, 0xc9, 0xd8, 0xc1, 0xae, 0xbe, 0x22, 0x3c, 0x6d, 0x4b, 0x90, 0x8f, 0x78, 0x66, 0x06, 0x46, 0x8e,
0xef, 0xf1, 0xc2, 0x98, 0x47, 0x4e, 0xe8, 0x35, 0xd7, 0x96, 0x8e, 0xbf, 0xac, 0xfb, 0x60, 0x0a, 0xe9, 0x8e, 0x3b, 0x49, 0x87, 0xff, 0x71, 0xf1, 0x74, 0x0c, 0x6a, 0xad, 0x7d, 0xb0, 0x7d, 0xfc,
0x6a, 0xd5, 0xbd, 0xb3, 0xe7, 0x6c, 0xae, 0xad, 0x19, 0x59, 0xee, 0x9e, 0x4c, 0x20, 0xfb, 0xe6, 0x9d, 0x9a, 0xc1, 0xa4, 0x17, 0xc7, 0x23, 0xc8, 0xae, 0xf8, 0x9b, 0xcb, 0x9b, 0xad, 0xbb, 0xf7,
0x2f, 0xce, 0x2f, 0xaf, 0xbc, 0xbd, 0xef, 0x57, 0xde, 0xde, 0xe7, 0xd6, 0x43, 0x97, 0xad, 0x87, 0x7d, 0xeb, 0xee, 0x7d, 0x6e, 0x5c, 0x74, 0xd3, 0xb8, 0xe8, 0x5b, 0xe3, 0xa2, 0x1f, 0x8d, 0x8b,
0xbe, 0xb5, 0x1e, 0xfa, 0xd1, 0x7a, 0xe8, 0xed, 0xe3, 0xff, 0xfa, 0x8b, 0x9f, 0x74, 0xeb, 0x6e, 0xde, 0xbf, 0xba, 0xd5, 0x13, 0x3d, 0x6b, 0xd7, 0xf5, 0xbe, 0xb9, 0xbd, 0x2f, 0x7f, 0x06, 0x00,
0xdf, 0xdc, 0xe7, 0xd3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x63, 0x74, 0x0f, 0x69, 0x0a, 0x04, 0x00, 0xff, 0xff, 0x66, 0x5a, 0xdb, 0x23, 0xe7, 0x03, 0x00, 0x00,
0x00, 0x00,
} }

16
api/services/diff/v1/diff.proto
View File

@ -5,8 +5,8 @@ package containerd.services.diff.v1;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/mount/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";
option go_package = "github.com/containerd/containerd/api/services/diff/v1;diff"; option go_package = "github.com/containerd/containerd/api/services/diff/v1;diff";
@ -24,26 +24,26 @@ service Diff {
message ApplyRequest { message ApplyRequest {
// Diff is the descriptor of the diff to be extracted // Diff is the descriptor of the diff to be extracted
containerd.v1.types.Descriptor diff = 1; containerd.types.Descriptor diff = 1;
repeated containerd.v1.types.Mount mounts = 2; repeated containerd.types.Mount mounts = 2;
} }
message ApplyResponse { message ApplyResponse {
// Applied is the descriptor for the object which was applied. // Applied is the descriptor for the object which was applied.
// If the input was a compressed blob then the result will be // If the input was a compressed blob then the result will be
// the descriptor for the uncompressed blob. // the descriptor for the uncompressed blob.
containerd.v1.types.Descriptor applied = 1; containerd.types.Descriptor applied = 1;
} }
message DiffRequest { message DiffRequest {
// Left are the mounts which represent the older copy // Left are the mounts which represent the older copy
// in which is the base of the computed changes. // in which is the base of the computed changes.
repeated containerd.v1.types.Mount left = 1; repeated containerd.types.Mount left = 1;
// Right are the mounts which represents the newer copy // Right are the mounts which represents the newer copy
// in which changes from the left were made into. // in which changes from the left were made into.
repeated containerd.v1.types.Mount right = 2; repeated containerd.types.Mount right = 2;
// MediaType is the media type descriptor for the created diff // MediaType is the media type descriptor for the created diff
// object // object
@ -56,5 +56,5 @@ message DiffRequest {
message DiffResponse { message DiffResponse {
// Diff is the descriptor of the diff which can be applied // Diff is the descriptor of the diff which can be applied
containerd.v1.types.Descriptor diff = 3; containerd.types.Descriptor diff = 3;
} }

78
api/services/images/v1/images.pb.go
View File

@ -25,7 +25,7 @@ import fmt "fmt"
import math "math" import math "math"
import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/gogo/protobuf/gogoproto"
import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
import containerd_v1_types "github.com/containerd/containerd/api/types/descriptor" import containerd_types "github.com/containerd/containerd/api/types"
import ( import (
context "golang.org/x/net/context" context "golang.org/x/net/context"
@ -50,9 +50,9 @@ var _ = math.Inf
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Image struct { type Image struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
Target containerd_v1_types.Descriptor `protobuf:"bytes,3,opt,name=target" json:"target"` Target containerd_types.Descriptor `protobuf:"bytes,3,opt,name=target" json:"target"`
} }
func (m *Image) Reset() { *m = Image{} } func (m *Image) Reset() { *m = Image{} }
@ -683,7 +683,7 @@ func (this *Image) String() string {
s := strings.Join([]string{`&Image{`, s := strings.Join([]string{`&Image{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Labels:` + mapStringForLabels + `,`, `Labels:` + mapStringForLabels + `,`,
`Target:` + strings.Replace(strings.Replace(this.Target.String(), "Descriptor", "containerd_v1_types.Descriptor", 1), `&`, ``, 1) + `,`, `Target:` + strings.Replace(strings.Replace(this.Target.String(), "Descriptor", "containerd_types.Descriptor", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1662,38 +1662,38 @@ func init() {
} }
var fileDescriptorImages = []byte{ var fileDescriptorImages = []byte{
// 523 bytes of a gzipped FileDescriptorProto // 518 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0x13, 0x41, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x8b, 0xd3, 0x40,
0x14, 0xcf, 0xe4, 0xcf, 0x82, 0x2f, 0x07, 0xeb, 0x58, 0x4a, 0x58, 0x71, 0x1b, 0x16, 0x85, 0x80, 0x14, 0xef, 0xf4, 0x4f, 0xc0, 0xd7, 0x83, 0xeb, 0xb8, 0x2c, 0x25, 0x6a, 0x2c, 0x41, 0xa1, 0x20,
0x30, 0x6b, 0xe2, 0x45, 0x2b, 0x8a, 0x84, 0xd4, 0x2a, 0x14, 0x0f, 0x11, 0xb5, 0x78, 0xdb, 0x24, 0x4c, 0x6c, 0xbc, 0x68, 0x17, 0x44, 0x4a, 0x97, 0x55, 0x58, 0x3c, 0x44, 0xd4, 0xc5, 0x5b, 0xda,
0x2f, 0xeb, 0xd2, 0xcd, 0xce, 0xba, 0x33, 0x59, 0xc8, 0xcd, 0xef, 0xe2, 0x97, 0xc9, 0xd1, 0xa3, 0xbe, 0xc6, 0xb0, 0x69, 0x26, 0x66, 0xa6, 0x85, 0xde, 0xfc, 0x2e, 0x7e, 0x99, 0x1e, 0x3d, 0x7a,
0x27, 0xb5, 0xf9, 0x24, 0xb2, 0x33, 0x13, 0xbb, 0x6d, 0x8a, 0x49, 0xda, 0xdb, 0x9b, 0xe4, 0xf7, 0x10, 0x71, 0xfb, 0x49, 0x24, 0x33, 0x53, 0xb7, 0xbb, 0x5d, 0x6c, 0xbb, 0xde, 0xde, 0xb4, 0xbf,
0xef, 0xbd, 0x99, 0x7d, 0xd0, 0x0b, 0x42, 0xf9, 0x65, 0x3a, 0x60, 0x43, 0x3e, 0xf1, 0x86, 0x3c, 0x7f, 0xef, 0xcd, 0xe4, 0x41, 0x2f, 0x8a, 0xe5, 0xe7, 0x49, 0x9f, 0x0d, 0xf8, 0xd8, 0x1b, 0xf0,
0x96, 0x7e, 0x18, 0x63, 0x3a, 0x2a, 0x96, 0x7e, 0x12, 0x7a, 0x02, 0xd3, 0x2c, 0x1c, 0xa2, 0xf0, 0x54, 0x86, 0x71, 0x8a, 0xf9, 0x70, 0xb5, 0x0c, 0xb3, 0xd8, 0x13, 0x98, 0x4f, 0xe3, 0x01, 0x0a,
0xc2, 0x89, 0x1f, 0xa0, 0xf0, 0xb2, 0xb6, 0xa9, 0x58, 0x92, 0x72, 0xc9, 0xe9, 0xfd, 0x73, 0x3c, 0x2f, 0x1e, 0x87, 0x11, 0x0a, 0x6f, 0xda, 0x36, 0x15, 0xcb, 0x72, 0x2e, 0x39, 0x7d, 0x70, 0x81,
0x5b, 0x62, 0x99, 0x41, 0x64, 0x6d, 0x7b, 0x37, 0xe0, 0x01, 0x57, 0x48, 0x2f, 0xaf, 0x34, 0xc9, 0x67, 0x4b, 0x2c, 0x33, 0x88, 0x69, 0xdb, 0xde, 0x8f, 0x78, 0xc4, 0x15, 0xd2, 0x2b, 0x2a, 0x4d,
0xbe, 0x17, 0x70, 0x1e, 0x44, 0xe8, 0xa9, 0xd3, 0x60, 0x3a, 0xf6, 0x70, 0x92, 0xc8, 0x99, 0xf9, 0xb2, 0xef, 0x45, 0x9c, 0x47, 0x09, 0x7a, 0xea, 0xd4, 0x9f, 0x8c, 0x3c, 0x1c, 0x67, 0x72, 0x66,
0xf3, 0xf5, 0x46, 0xb9, 0xe4, 0x2c, 0x41, 0xe1, 0x8d, 0x50, 0x0c, 0xd3, 0x30, 0x91, 0x3c, 0x2d, 0xfe, 0x3c, 0xdc, 0x2a, 0x97, 0x9c, 0x65, 0x28, 0xbc, 0x21, 0x8a, 0x41, 0x1e, 0x67, 0x92, 0xe7,
0x94, 0x5a, 0xc7, 0xfd, 0x4d, 0xa0, 0xf6, 0x36, 0x0f, 0x42, 0x29, 0x54, 0x63, 0x7f, 0x82, 0x0d, 0x9a, 0xec, 0xfe, 0x24, 0x50, 0x7b, 0x53, 0xb8, 0x53, 0x0a, 0xd5, 0x34, 0x1c, 0x63, 0x83, 0x34,
0xd2, 0x24, 0xad, 0x5b, 0x7d, 0x55, 0xd3, 0x37, 0x60, 0x45, 0xfe, 0x00, 0x23, 0xd1, 0x28, 0x37, 0x49, 0xeb, 0x56, 0xa0, 0x6a, 0xfa, 0x1a, 0xac, 0x24, 0xec, 0x63, 0x22, 0x1a, 0xe5, 0x66, 0xa5,
0x2b, 0xad, 0x7a, 0xe7, 0x31, 0xfb, 0x6f, 0x23, 0x4c, 0x29, 0xb1, 0x63, 0x45, 0x39, 0x8c, 0x65, 0x55, 0xf7, 0x9f, 0xb2, 0x7f, 0xa6, 0x67, 0x4a, 0x89, 0x9d, 0x28, 0xca, 0x51, 0x2a, 0xf3, 0x59,
0x3a, 0xeb, 0x1b, 0x3e, 0x7d, 0x01, 0x96, 0xf4, 0xd3, 0x00, 0x65, 0xa3, 0xd2, 0x24, 0xad, 0x7a, 0x60, 0xf8, 0xb4, 0x03, 0x96, 0x0c, 0xf3, 0x08, 0x65, 0xa3, 0xd2, 0x24, 0xad, 0xba, 0x7f, 0x7f,
0x67, 0xbf, 0xa8, 0x94, 0xb5, 0x99, 0x4a, 0xca, 0x7a, 0xff, 0xe2, 0x75, 0xab, 0xf3, 0x5f, 0xfb, 0x55, 0x49, 0x65, 0x63, 0xbd, 0xbf, 0xd9, 0xba, 0xd5, 0xf9, 0xaf, 0x87, 0xa5, 0xc0, 0x30, 0xec,
0xa5, 0xbe, 0x21, 0xd9, 0xcf, 0xa0, 0x5e, 0x50, 0xa5, 0x3b, 0x50, 0x39, 0xc5, 0x99, 0x89, 0x9a, 0x17, 0x50, 0x5f, 0x91, 0xa4, 0x7b, 0x50, 0x39, 0xc3, 0x99, 0xc9, 0x59, 0x94, 0x74, 0x1f, 0x6a,
0x97, 0x74, 0x17, 0x6a, 0x99, 0x1f, 0x4d, 0xb1, 0x51, 0x56, 0xbf, 0xe9, 0xc3, 0x41, 0xf9, 0x29, 0xd3, 0x30, 0x99, 0x60, 0xa3, 0xac, 0x7e, 0xd3, 0x87, 0x4e, 0xf9, 0x39, 0x71, 0x1f, 0xc3, 0xed,
0x71, 0x1f, 0xc2, 0xed, 0x23, 0x94, 0x2a, 0x59, 0x1f, 0xbf, 0x4e, 0x51, 0xc8, 0xab, 0x5a, 0x75, 0x63, 0x94, 0x2a, 0x56, 0x80, 0x5f, 0x26, 0x28, 0xe4, 0x75, 0x7d, 0xba, 0x6f, 0x61, 0xef, 0x02,
0xdf, 0xc1, 0xce, 0x39, 0x4c, 0x24, 0x3c, 0x16, 0x48, 0x0f, 0xa0, 0xa6, 0x7a, 0x53, 0xc0, 0x7a, 0x26, 0x32, 0x9e, 0x0a, 0xa4, 0x1d, 0xa8, 0xa9, 0xc6, 0x14, 0xb0, 0xee, 0x3f, 0xda, 0xa6, 0xf5,
0xe7, 0xc1, 0x26, 0xdd, 0xf7, 0x35, 0xc5, 0xfd, 0x08, 0xf4, 0x43, 0x32, 0xf2, 0x25, 0x5e, 0x70, 0x40, 0x53, 0xdc, 0x0f, 0x40, 0xdf, 0x67, 0xc3, 0x50, 0xe2, 0x25, 0xe7, 0x57, 0x37, 0x50, 0x34,
0x7e, 0x75, 0x0d, 0x45, 0x33, 0x0a, 0xa3, 0xfb, 0x09, 0xee, 0x5e, 0xd0, 0x35, 0x51, 0x6f, 0x2e, 0xa3, 0x30, 0xba, 0x1f, 0xe1, 0xee, 0x25, 0x5d, 0x13, 0xf5, 0xff, 0x85, 0x9f, 0xc0, 0x9d, 0x93,
0xfc, 0x08, 0xee, 0x1c, 0x87, 0x42, 0x4f, 0x40, 0x2c, 0xf3, 0xee, 0x81, 0x35, 0x0e, 0x23, 0x89, 0x58, 0xe8, 0x09, 0x88, 0x65, 0xde, 0x03, 0xb0, 0x46, 0x71, 0x22, 0x31, 0x37, 0xb3, 0x32, 0x27,
0xa9, 0x99, 0x95, 0x39, 0xb9, 0x27, 0x40, 0x8b, 0x60, 0x13, 0xa2, 0x0b, 0x96, 0xb6, 0x68, 0x10, 0xf7, 0x14, 0xe8, 0x2a, 0xd8, 0x84, 0xe8, 0x82, 0xa5, 0x2d, 0x1a, 0x44, 0xbd, 0x95, 0x5d, 0x52,
0xf5, 0x5c, 0xb6, 0x49, 0x61, 0x98, 0x6e, 0x0b, 0x68, 0x0f, 0x23, 0xbc, 0x34, 0xb7, 0x2b, 0x6e, 0x18, 0xa6, 0xdb, 0x02, 0xda, 0xc3, 0x04, 0xaf, 0xcc, 0xed, 0x9a, 0x1b, 0xf3, 0xbf, 0x55, 0xc0,
0xac, 0xf3, 0xbd, 0x02, 0x96, 0x0e, 0x40, 0xc7, 0x50, 0x39, 0x42, 0x49, 0xd9, 0x1a, 0xbf, 0x4b, 0xd2, 0x01, 0xe8, 0x08, 0x2a, 0xc7, 0x28, 0x29, 0xdb, 0xe0, 0x77, 0xe5, 0x1d, 0xd8, 0xde, 0xd6,
0xef, 0xc0, 0xf6, 0x36, 0xc6, 0x9b, 0x06, 0x4f, 0xa1, 0x9a, 0xb7, 0x4d, 0xd7, 0x7d, 0x07, 0x2b, 0x78, 0xd3, 0xe0, 0x19, 0x54, 0x8b, 0xb6, 0xe9, 0xa6, 0x8f, 0x60, 0x6d, 0x90, 0x76, 0x7b, 0x07,
0x83, 0xb4, 0xdb, 0x5b, 0x30, 0x8c, 0x19, 0x07, 0x4b, 0xdf, 0x34, 0x5d, 0x47, 0x5e, 0x7d, 0x68, 0x86, 0x31, 0xe3, 0x60, 0xe9, 0x9b, 0xa6, 0x9b, 0xc8, 0xeb, 0x0f, 0xcd, 0xf6, 0x77, 0xa1, 0x18,
0x76, 0x67, 0x1b, 0x8a, 0x31, 0x7c, 0x0f, 0x96, 0x1e, 0xfd, 0x5a, 0xc3, 0xd5, 0x1b, 0xb2, 0xf7, 0xc3, 0x77, 0x60, 0xe9, 0xd1, 0x6f, 0x34, 0x5c, 0xbf, 0x21, 0xfb, 0x80, 0xe9, 0x05, 0xc5, 0x96,
0x98, 0x5e, 0x57, 0x6c, 0xb9, 0xae, 0xd8, 0x61, 0xbe, 0xae, 0xba, 0x27, 0xf3, 0x33, 0xa7, 0xf4, 0x0b, 0x8a, 0x1d, 0x15, 0x0b, 0xaa, 0x7b, 0x3a, 0x3f, 0x77, 0x4a, 0x3f, 0xce, 0x9d, 0xd2, 0xd7,
0xf3, 0xcc, 0x29, 0x7d, 0x5b, 0x38, 0x64, 0xbe, 0x70, 0xc8, 0x8f, 0x85, 0x43, 0xfe, 0x2c, 0x1c, 0x85, 0x43, 0xe6, 0x0b, 0x87, 0x7c, 0x5f, 0x38, 0xe4, 0xf7, 0xc2, 0x21, 0x9f, 0x5e, 0xde, 0x70,
0xf2, 0xf9, 0xe5, 0x35, 0x57, 0xeb, 0x73, 0x5d, 0x0d, 0x2c, 0xe5, 0xf4, 0xe4, 0x6f, 0x00, 0x00, 0x99, 0x1e, 0xea, 0xaa, 0x6f, 0x29, 0xa7, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x0f,
0x00, 0xff, 0xff, 0xb3, 0x1d, 0x46, 0xc6, 0xa3, 0x05, 0x00, 0x00, 0x7b, 0x86, 0x95, 0x05, 0x00, 0x00,
} }

4
api/services/images/v1/images.proto
View File

@ -4,7 +4,7 @@ package containerd.services.images.v1;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";
option go_package = "github.com/containerd/containerd/api/services/images/v1;images"; option go_package = "github.com/containerd/containerd/api/services/images/v1;images";
@ -37,7 +37,7 @@ service Images {
message Image { message Image {
string name = 1; string name = 1;
map<string, string> labels = 2; map<string, string> labels = 2;
containerd.v1.types.Descriptor target = 3 [(gogoproto.nullable) = false]; containerd.types.Descriptor target = 3 [(gogoproto.nullable) = false];
} }
message GetImageRequest { message GetImageRequest {

212
api/services/shim/v1/shim.pb.go
View File

@ -39,8 +39,8 @@ import math "math"
import google_protobuf "github.com/gogo/protobuf/types" import google_protobuf "github.com/gogo/protobuf/types"
import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/gogo/protobuf/gogoproto"
import containerd_v1_types "github.com/containerd/containerd/api/types/mount" import containerd_types "github.com/containerd/containerd/api/types"
import containerd_v1_types1 "github.com/containerd/containerd/api/types/task" import containerd_v1_types "github.com/containerd/containerd/api/types/task"
import _ "github.com/gogo/protobuf/types" import _ "github.com/gogo/protobuf/types"
import time "time" import time "time"
@ -71,17 +71,17 @@ var _ = time.Kitchen
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type CreateRequest struct { type CreateRequest struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"` Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Runtime string `protobuf:"bytes,3,opt,name=runtime,proto3" json:"runtime,omitempty"` Runtime string `protobuf:"bytes,3,opt,name=runtime,proto3" json:"runtime,omitempty"`
NoPivot bool `protobuf:"varint,4,opt,name=no_pivot,json=noPivot,proto3" json:"no_pivot,omitempty"` NoPivot bool `protobuf:"varint,4,opt,name=no_pivot,json=noPivot,proto3" json:"no_pivot,omitempty"`
Terminal bool `protobuf:"varint,5,opt,name=terminal,proto3" json:"terminal,omitempty"` Terminal bool `protobuf:"varint,5,opt,name=terminal,proto3" json:"terminal,omitempty"`
Stdin string `protobuf:"bytes,6,opt,name=stdin,proto3" json:"stdin,omitempty"` Stdin string `protobuf:"bytes,6,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,7,opt,name=stdout,proto3" json:"stdout,omitempty"` Stdout string `protobuf:"bytes,7,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,8,opt,name=stderr,proto3" json:"stderr,omitempty"` Stderr string `protobuf:"bytes,8,opt,name=stderr,proto3" json:"stderr,omitempty"`
Rootfs []*containerd_v1_types.Mount `protobuf:"bytes,9,rep,name=rootfs" json:"rootfs,omitempty"` Rootfs []*containerd_types.Mount `protobuf:"bytes,9,rep,name=rootfs" json:"rootfs,omitempty"`
Checkpoint string `protobuf:"bytes,10,opt,name=checkpoint,proto3" json:"checkpoint,omitempty"` Checkpoint string `protobuf:"bytes,10,opt,name=checkpoint,proto3" json:"checkpoint,omitempty"`
ParentCheckpoint string `protobuf:"bytes,11,opt,name=parent_checkpoint,json=parentCheckpoint,proto3" json:"parent_checkpoint,omitempty"` ParentCheckpoint string `protobuf:"bytes,11,opt,name=parent_checkpoint,json=parentCheckpoint,proto3" json:"parent_checkpoint,omitempty"`
} }
func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) Reset() { *m = CreateRequest{} }
@ -183,15 +183,15 @@ func (*StateRequest) ProtoMessage() {}
func (*StateRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{11} } func (*StateRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{11} }
type StateResponse struct { type StateResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"` Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"` Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status containerd_v1_types1.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"` Status containerd_v1_types.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Processes []*containerd_v1_types1.Process `protobuf:"bytes,5,rep,name=processes" json:"processes,omitempty"` Processes []*containerd_v1_types.Process `protobuf:"bytes,5,rep,name=processes" json:"processes,omitempty"`
Stdin string `protobuf:"bytes,6,opt,name=stdin,proto3" json:"stdin,omitempty"` Stdin string `protobuf:"bytes,6,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,7,opt,name=stdout,proto3" json:"stdout,omitempty"` Stdout string `protobuf:"bytes,7,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,8,opt,name=stderr,proto3" json:"stderr,omitempty"` Stderr string `protobuf:"bytes,8,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,9,opt,name=terminal,proto3" json:"terminal,omitempty"` Terminal bool `protobuf:"varint,9,opt,name=terminal,proto3" json:"terminal,omitempty"`
} }
func (m *StateResponse) Reset() { *m = StateResponse{} } func (m *StateResponse) Reset() { *m = StateResponse{} }
@ -246,7 +246,7 @@ func (*ProcessesRequest) ProtoMessage() {}
func (*ProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{18} } func (*ProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{18} }
type ProcessesResponse struct { type ProcessesResponse struct {
Processes []*containerd_v1_types1.Process `protobuf:"bytes,1,rep,name=processes" json:"processes,omitempty"` Processes []*containerd_v1_types.Process `protobuf:"bytes,1,rep,name=processes" json:"processes,omitempty"`
} }
func (m *ProcessesResponse) Reset() { *m = ProcessesResponse{} } func (m *ProcessesResponse) Reset() { *m = ProcessesResponse{} }
@ -428,7 +428,7 @@ func (c *shimClient) Events(ctx context.Context, in *EventsRequest, opts ...grpc
} }
type Shim_EventsClient interface { type Shim_EventsClient interface {
Recv() (*containerd_v1_types1.Event, error) Recv() (*containerd_v1_types.Event, error)
grpc.ClientStream grpc.ClientStream
} }
@ -436,8 +436,8 @@ type shimEventsClient struct {
grpc.ClientStream grpc.ClientStream
} }
func (x *shimEventsClient) Recv() (*containerd_v1_types1.Event, error) { func (x *shimEventsClient) Recv() (*containerd_v1_types.Event, error) {
m := new(containerd_v1_types1.Event) m := new(containerd_v1_types.Event)
if err := x.ClientStream.RecvMsg(m); err != nil { if err := x.ClientStream.RecvMsg(m); err != nil {
return nil, err return nil, err
} }
@ -693,7 +693,7 @@ func _Shim_Events_Handler(srv interface{}, stream grpc.ServerStream) error {
} }
type Shim_EventsServer interface { type Shim_EventsServer interface {
Send(*containerd_v1_types1.Event) error Send(*containerd_v1_types.Event) error
grpc.ServerStream grpc.ServerStream
} }
@ -701,7 +701,7 @@ type shimEventsServer struct {
grpc.ServerStream grpc.ServerStream
} }
func (x *shimEventsServer) Send(m *containerd_v1_types1.Event) error { func (x *shimEventsServer) Send(m *containerd_v1_types.Event) error {
return x.ServerStream.SendMsg(m) return x.ServerStream.SendMsg(m)
} }
@ -1883,7 +1883,7 @@ func (this *CreateRequest) String() string {
`Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`, `Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`,
`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`, `Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`, `Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
`Rootfs:` + strings.Replace(fmt.Sprintf("%v", this.Rootfs), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Rootfs:` + strings.Replace(fmt.Sprintf("%v", this.Rootfs), "Mount", "containerd_types.Mount", 1) + `,`,
`Checkpoint:` + fmt.Sprintf("%v", this.Checkpoint) + `,`, `Checkpoint:` + fmt.Sprintf("%v", this.Checkpoint) + `,`,
`ParentCheckpoint:` + fmt.Sprintf("%v", this.ParentCheckpoint) + `,`, `ParentCheckpoint:` + fmt.Sprintf("%v", this.ParentCheckpoint) + `,`,
`}`, `}`,
@ -2015,7 +2015,7 @@ func (this *StateResponse) String() string {
`Bundle:` + fmt.Sprintf("%v", this.Bundle) + `,`, `Bundle:` + fmt.Sprintf("%v", this.Bundle) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`,
`Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types1.Process", 1) + `,`, `Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types.Process", 1) + `,`,
`Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`, `Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`,
`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`, `Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`, `Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
@ -2088,7 +2088,7 @@ func (this *ProcessesResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ProcessesResponse{`, s := strings.Join([]string{`&ProcessesResponse{`,
`Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types1.Process", 1) + `,`, `Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types.Process", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2391,7 +2391,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Rootfs = append(m.Rootfs, &containerd_v1_types.Mount{}) m.Rootfs = append(m.Rootfs, &containerd_types.Mount{})
if err := m.Rootfs[len(m.Rootfs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Rootfs[len(m.Rootfs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -3534,7 +3534,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
m.Status |= (containerd_v1_types1.Status(b) & 0x7F) << shift m.Status |= (containerd_v1_types.Status(b) & 0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
@ -3565,7 +3565,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Processes = append(m.Processes, &containerd_v1_types1.Process{}) m.Processes = append(m.Processes, &containerd_v1_types.Process{})
if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -4159,7 +4159,7 @@ func (m *ProcessesResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Processes = append(m.Processes, &containerd_v1_types1.Process{}) m.Processes = append(m.Processes, &containerd_v1_types.Process{})
if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -4490,76 +4490,76 @@ func init() {
} }
var fileDescriptorShim = []byte{ var fileDescriptorShim = []byte{
// 1127 bytes of a gzipped FileDescriptorProto // 1129 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x4f, 0xe3, 0x46, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x4f, 0xe3, 0x46,
0x14, 0x5f, 0x27, 0x21, 0x24, 0x2f, 0x84, 0xc2, 0x08, 0x21, 0x6f, 0xb6, 0x0a, 0xc8, 0x52, 0x25, 0x14, 0xc7, 0x49, 0x08, 0xc9, 0x0b, 0xa1, 0x30, 0x42, 0xd4, 0xeb, 0xad, 0x02, 0xb2, 0x54, 0x09,
0xd4, 0x0f, 0x67, 0x09, 0x52, 0x55, 0xd1, 0x1e, 0x96, 0xaf, 0xc3, 0x6a, 0xbb, 0x22, 0x35, 0x2b, 0xf5, 0xc3, 0x5e, 0x82, 0xb4, 0xaa, 0xe8, 0x65, 0xf9, 0x3a, 0xac, 0xb6, 0x2b, 0x52, 0xb3, 0x52,
0x55, 0xdd, 0x0b, 0x32, 0xc9, 0x10, 0x8f, 0xb0, 0x3d, 0xae, 0x67, 0x9c, 0x92, 0x5b, 0x4f, 0x3d, 0xd5, 0xbd, 0x20, 0x93, 0x0c, 0xc9, 0x08, 0xc7, 0xe3, 0x7a, 0xc6, 0x29, 0xb9, 0xf5, 0xd4, 0x73,
0xb7, 0xc7, 0xde, 0xfb, 0x7f, 0xf4, 0xca, 0xb1, 0xb7, 0xf6, 0xb4, 0xed, 0xf2, 0x97, 0x54, 0xf3, 0x7b, 0xec, 0xbd, 0xff, 0x47, 0xaf, 0x1c, 0x7b, 0xe8, 0xa1, 0xa7, 0x6d, 0x97, 0xbf, 0xa4, 0x9a,
0x61, 0xc7, 0x01, 0x5c, 0x0c, 0xea, 0x85, 0xcc, 0x7b, 0xf3, 0xde, 0x9b, 0xf7, 0xf1, 0x7b, 0xef, 0x0f, 0x27, 0x0e, 0xe0, 0xc6, 0xa0, 0xbd, 0x90, 0x79, 0x6f, 0xde, 0x7b, 0xf3, 0x3e, 0x7e, 0xef,
0x19, 0x78, 0x31, 0x26, 0xdc, 0x4b, 0xce, 0xec, 0x21, 0x0d, 0x7a, 0x43, 0x1a, 0x72, 0x97, 0x84, 0x3d, 0x03, 0x2f, 0xfa, 0x84, 0x0f, 0x92, 0x73, 0xa7, 0x4b, 0x87, 0x6e, 0x97, 0x86, 0xdc, 0x27,
0x38, 0x1e, 0xe5, 0x8f, 0x6e, 0x44, 0x7a, 0x0c, 0xc7, 0x13, 0x32, 0xc4, 0xac, 0xc7, 0x3c, 0x12, 0x21, 0x8e, 0x7b, 0xd9, 0xa3, 0x1f, 0x11, 0x97, 0xe1, 0x78, 0x44, 0xba, 0x98, 0xb9, 0x6c, 0x40,
0xf4, 0x26, 0xdb, 0xf2, 0xd7, 0x8e, 0x62, 0xca, 0x29, 0xda, 0x9c, 0xc9, 0xda, 0x71, 0x12, 0x72, 0x86, 0xee, 0x68, 0x47, 0xfe, 0x3a, 0x51, 0x4c, 0x39, 0x45, 0x5b, 0x53, 0x59, 0x27, 0x4e, 0x42,
0x12, 0x60, 0xdb, 0x27, 0x61, 0x72, 0x69, 0x4b, 0xa1, 0xc9, 0x76, 0xe7, 0xe9, 0x98, 0xd2, 0xb1, 0x4e, 0x86, 0xd8, 0x09, 0x48, 0x98, 0x5c, 0x39, 0x52, 0x68, 0xb4, 0x63, 0x3d, 0xe9, 0x53, 0xda,
0x8f, 0x7b, 0x52, 0xfe, 0x2c, 0x39, 0xef, 0xb9, 0xe1, 0x54, 0x29, 0x77, 0x9e, 0xdd, 0xbc, 0xc2, 0x0f, 0xb0, 0x2b, 0xe5, 0xcf, 0x93, 0x0b, 0xd7, 0x0f, 0xc7, 0x4a, 0xd9, 0x7a, 0x7a, 0xfb, 0x0a,
0x41, 0xc4, 0xd3, 0xcb, 0xb5, 0x31, 0x1d, 0x53, 0x79, 0xec, 0x89, 0x93, 0xe6, 0x7e, 0x55, 0xca, 0x0f, 0x23, 0x9e, 0x5e, 0xae, 0xf7, 0x69, 0x9f, 0xca, 0xa3, 0x2b, 0x4e, 0x9a, 0xfb, 0xbc, 0x90,
0x63, 0x3e, 0x8d, 0x30, 0xeb, 0x05, 0x34, 0x09, 0xb9, 0xfa, 0xab, 0xb5, 0x77, 0x1f, 0xa0, 0xcd, 0xc7, 0x7c, 0x1c, 0x61, 0xe6, 0x0e, 0x69, 0x12, 0x72, 0xad, 0xb7, 0xf7, 0x00, 0x3d, 0xee, 0xb3,
0x5d, 0x76, 0x21, 0xff, 0x68, 0xdd, 0x8d, 0x9b, 0xce, 0x8a, 0x58, 0x19, 0x77, 0x83, 0x48, 0x09, 0x4b, 0xf9, 0x47, 0xeb, 0x6e, 0xde, 0x76, 0x53, 0x44, 0xc9, 0xb8, 0x3f, 0x8c, 0x94, 0x80, 0xfd,
0x58, 0x7f, 0x56, 0xa0, 0x7d, 0x10, 0x63, 0x97, 0x63, 0x07, 0x7f, 0x9f, 0x60, 0xc6, 0xd1, 0x3a, 0x57, 0x09, 0x9a, 0x87, 0x31, 0xf6, 0x39, 0xf6, 0xf0, 0x0f, 0x09, 0x66, 0x1c, 0x6d, 0x40, 0x89,
0x54, 0xc8, 0xc8, 0x34, 0x36, 0x8d, 0xad, 0xe6, 0x7e, 0xfd, 0xfa, 0xdd, 0x46, 0xe5, 0xe5, 0xa1, 0xf4, 0x4c, 0x63, 0xcb, 0xd8, 0xae, 0x1f, 0x54, 0x6f, 0xde, 0x6d, 0x96, 0x5e, 0x1e, 0x79, 0x25,
0x53, 0x21, 0x23, 0xb4, 0x0e, 0xf5, 0xb3, 0x24, 0x1c, 0xf9, 0xd8, 0xac, 0x88, 0x3b, 0x47, 0x53, 0xd2, 0x43, 0x1b, 0x50, 0x3d, 0x4f, 0xc2, 0x5e, 0x80, 0xcd, 0x92, 0xb8, 0xf3, 0x34, 0x85, 0x4c,
0xc8, 0x84, 0x45, 0x9d, 0x43, 0xb3, 0x2a, 0x2f, 0x52, 0x12, 0x3d, 0x85, 0x46, 0x48, 0x4f, 0x23, 0x58, 0xd2, 0xd9, 0x33, 0xcb, 0xf2, 0x22, 0x25, 0xd1, 0x13, 0xa8, 0x85, 0xf4, 0x2c, 0x22, 0x23,
0x32, 0xa1, 0xdc, 0xac, 0x6d, 0x1a, 0x5b, 0x0d, 0x67, 0x31, 0xa4, 0x03, 0x41, 0xa2, 0x0e, 0x34, 0xca, 0xcd, 0xca, 0x96, 0xb1, 0x5d, 0xf3, 0x96, 0x42, 0xda, 0x11, 0x24, 0xb2, 0xa0, 0xc6, 0x71,
0x38, 0x8e, 0x03, 0x12, 0xba, 0xbe, 0xb9, 0x20, 0xaf, 0x32, 0x1a, 0xad, 0xc1, 0x02, 0xe3, 0x23, 0x3c, 0x24, 0xa1, 0x1f, 0x98, 0x8b, 0xf2, 0x6a, 0x42, 0xa3, 0x75, 0x58, 0x64, 0xbc, 0x47, 0x42,
0x12, 0x9a, 0x75, 0x69, 0x4e, 0x11, 0xe2, 0x79, 0xc6, 0x47, 0x34, 0xe1, 0xe6, 0xa2, 0x7a, 0x5e, 0xb3, 0x2a, 0xcd, 0x29, 0x42, 0x3c, 0xcf, 0x78, 0x8f, 0x26, 0xdc, 0x5c, 0x52, 0xcf, 0x2b, 0x4a,
0x51, 0x9a, 0x8f, 0xe3, 0xd8, 0x6c, 0x64, 0x7c, 0x1c, 0xc7, 0xa8, 0x0f, 0xf5, 0x98, 0x52, 0x7e, 0xf3, 0x71, 0x1c, 0x9b, 0xb5, 0x09, 0x1f, 0xc7, 0x31, 0x72, 0xa1, 0x1a, 0x53, 0xca, 0x2f, 0x98,
0xce, 0xcc, 0xe6, 0x66, 0x75, 0xab, 0xd5, 0xef, 0xd8, 0xb9, 0xa2, 0x4f, 0xb6, 0x6d, 0x99, 0x2f, 0x59, 0xdf, 0x2a, 0x6f, 0x37, 0xda, 0x1f, 0x3b, 0x99, 0x72, 0xcb, 0x64, 0x39, 0xaf, 0x45, 0x92,
0xfb, 0xb5, 0xc8, 0xb3, 0xa3, 0x25, 0x51, 0x17, 0x60, 0xe8, 0xe1, 0xe1, 0x45, 0x44, 0x49, 0xc8, 0x3d, 0x2d, 0x86, 0x5a, 0x00, 0xdd, 0x01, 0xee, 0x5e, 0x46, 0x94, 0x84, 0xdc, 0x04, 0x69, 0x2c,
0x4d, 0x90, 0xf6, 0x72, 0x1c, 0xf4, 0x09, 0xac, 0x46, 0x6e, 0x8c, 0x43, 0x7e, 0x9a, 0x13, 0x6b, 0xc3, 0x41, 0x9f, 0xc3, 0x5a, 0xe4, 0xc7, 0x38, 0xe4, 0x67, 0x19, 0xb1, 0x86, 0x14, 0x5b, 0x55,
0x49, 0xb1, 0x15, 0x75, 0x71, 0x90, 0xf1, 0x2d, 0x0b, 0x96, 0xd3, 0xc4, 0xb2, 0x88, 0x86, 0x0c, 0x17, 0x87, 0x13, 0xbe, 0x6d, 0xc3, 0x4a, 0x9a, 0x55, 0x16, 0xd1, 0x90, 0x61, 0xb4, 0x0a, 0xe5,
0xa3, 0x15, 0xa8, 0x46, 0x3a, 0xb5, 0x6d, 0x47, 0x1c, 0xad, 0x65, 0x58, 0x3a, 0xe1, 0x6e, 0xcc, 0x48, 0xe7, 0xb5, 0xe9, 0x89, 0xa3, 0xbd, 0x02, 0xcb, 0xa7, 0xdc, 0x8f, 0xb9, 0x4e, 0xbc, 0xfd,
0x75, 0xee, 0xad, 0x0f, 0xa0, 0x7d, 0x88, 0x7d, 0x9c, 0x15, 0xc3, 0xfa, 0xc9, 0x80, 0xe5, 0x94, 0x11, 0x34, 0x8f, 0x70, 0x80, 0x27, 0x95, 0xb0, 0x7f, 0x36, 0x60, 0x25, 0xe5, 0xe4, 0x59, 0x41,
0x53, 0x64, 0x05, 0x6d, 0x40, 0x0b, 0x5f, 0x12, 0x7e, 0xca, 0xb8, 0xcb, 0x13, 0x26, 0xcb, 0xd3, 0x9b, 0xd0, 0xc0, 0x57, 0x84, 0x9f, 0x31, 0xee, 0xf3, 0x84, 0xc9, 0xda, 0x34, 0x3d, 0x10, 0xac,
0x76, 0x40, 0xb0, 0x4e, 0x24, 0x07, 0xed, 0x41, 0x53, 0x50, 0x78, 0x74, 0xea, 0x72, 0x59, 0x24, 0x53, 0xc9, 0x41, 0xfb, 0x50, 0x17, 0x14, 0xee, 0x9d, 0xf9, 0x5c, 0x56, 0xa8, 0xd1, 0xb6, 0x1c,
0x91, 0x0e, 0x85, 0x0c, 0x3b, 0x45, 0x86, 0xfd, 0x26, 0x45, 0xc6, 0x7e, 0xe3, 0xea, 0xdd, 0xc6, 0x05, 0x0b, 0x27, 0x85, 0x85, 0xf3, 0x26, 0x85, 0xc5, 0x41, 0xed, 0xfa, 0xdd, 0xe6, 0xc2, 0x2f,
0x93, 0x9f, 0xff, 0xde, 0x30, 0x9c, 0x86, 0x52, 0xdb, 0xe3, 0xd6, 0x16, 0xac, 0x29, 0x3f, 0x06, 0xff, 0x6c, 0x1a, 0x5e, 0x4d, 0xa9, 0xed, 0x73, 0x7b, 0x1b, 0xd6, 0x95, 0x1f, 0x9d, 0x98, 0x76,
0x31, 0x1d, 0x62, 0xc6, 0x52, 0xb4, 0xdc, 0x8e, 0xe9, 0x57, 0x03, 0x5a, 0x47, 0x97, 0x78, 0x98, 0x31, 0x63, 0x29, 0x54, 0xee, 0xc6, 0xf4, 0x9b, 0x01, 0x8d, 0xe3, 0x2b, 0xdc, 0x4d, 0x25, 0xb2,
0x4a, 0xe4, 0x4b, 0x6d, 0x14, 0x95, 0xba, 0x72, 0x77, 0xa9, 0xab, 0x05, 0xa5, 0xae, 0xcd, 0x95, 0x75, 0x36, 0xf2, 0xea, 0x5c, 0xba, 0xbf, 0xce, 0xe5, 0x9c, 0x3a, 0x57, 0x66, 0xea, 0xbc, 0x0d,
0x7a, 0x0b, 0x6a, 0x2c, 0xc2, 0x43, 0x09, 0xa4, 0x56, 0x7f, 0xed, 0x56, 0x64, 0x7b, 0xe1, 0xd4, 0x15, 0x16, 0xe1, 0xae, 0x44, 0x51, 0xa3, 0xbd, 0x7e, 0x27, 0xb2, 0xfd, 0x70, 0xec, 0x49, 0x09,
0x91, 0x12, 0xd6, 0x21, 0xd4, 0x1d, 0x9f, 0x04, 0x84, 0x23, 0x04, 0x35, 0x81, 0x00, 0x85, 0x73, 0xfb, 0x08, 0xaa, 0x5e, 0x40, 0x86, 0x84, 0x23, 0x04, 0x15, 0x81, 0x00, 0x05, 0x72, 0x4f, 0x9e,
0x47, 0x9e, 0x05, 0xcf, 0x73, 0xe3, 0x91, 0x74, 0xa6, 0xe6, 0xc8, 0xb3, 0xe0, 0x31, 0x7a, 0xae, 0x05, 0x6f, 0xe0, 0xc7, 0x3d, 0xe9, 0x4c, 0xc5, 0x93, 0x67, 0xc1, 0x63, 0xf4, 0x42, 0x79, 0x52,
0x3c, 0xa9, 0x39, 0xf2, 0x6c, 0x6d, 0xc2, 0x92, 0x0a, 0xb0, 0xb0, 0xae, 0x5f, 0x03, 0x0c, 0xf8, 0xf1, 0xe4, 0xd9, 0xde, 0x82, 0x65, 0x15, 0x60, 0x6e, 0x5d, 0xbf, 0x01, 0xe8, 0xf0, 0x71, 0x6e,
0xb4, 0x30, 0x47, 0x22, 0xee, 0x1f, 0xc8, 0x88, 0x7b, 0xba, 0x56, 0x8a, 0x10, 0xf1, 0x79, 0x98, 0x8e, 0x44, 0xdc, 0x3f, 0x92, 0x1e, 0x1f, 0xe8, 0x5a, 0x29, 0x42, 0xc4, 0x37, 0xc0, 0xa4, 0x3f,
0x8c, 0x3d, 0xf5, 0x5a, 0xdb, 0xd1, 0x94, 0x40, 0xc5, 0xd1, 0x04, 0x87, 0x3c, 0x4d, 0xba, 0x86, 0x50, 0xaf, 0x35, 0x3d, 0x4d, 0x09, 0x54, 0x1c, 0x8f, 0x70, 0xc8, 0xd3, 0xa4, 0x6b, 0xd8, 0x4c,
0xcd, 0x0c, 0x25, 0xbf, 0x55, 0xa0, 0xad, 0x19, 0xda, 0xa5, 0x87, 0x36, 0xb1, 0x76, 0xb1, 0x3a, 0x51, 0xf2, 0x7b, 0x09, 0x9a, 0x9a, 0xa1, 0x5d, 0x7a, 0x68, 0x07, 0x6b, 0x17, 0xcb, 0x53, 0x17,
0x73, 0x71, 0x47, 0x24, 0x5b, 0xe2, 0x49, 0x24, 0x7b, 0xb9, 0xff, 0xec, 0xce, 0xfe, 0x51, 0x00, 0x77, 0x45, 0xb2, 0x25, 0x9e, 0x44, 0xb2, 0x57, 0xda, 0x4f, 0xb3, 0xcd, 0x33, 0xda, 0xd1, 0xfd,
0x73, 0xb4, 0x28, 0xda, 0x85, 0x66, 0xa4, 0xf0, 0x81, 0x99, 0xb9, 0x20, 0xfb, 0xee, 0xc3, 0x3b, 0xa3, 0x00, 0xe6, 0x69, 0x51, 0xb4, 0x07, 0xf5, 0x48, 0xe1, 0x03, 0x33, 0x73, 0x51, 0x36, 0xdd,
0xf5, 0x52, 0x14, 0xcd, 0xc4, 0xff, 0xa7, 0xb6, 0xcf, 0xa3, 0xad, 0x39, 0x8f, 0x36, 0x91, 0xb6, 0x27, 0xf7, 0xea, 0xa5, 0x28, 0x9a, 0x8a, 0x7f, 0xa0, 0x9e, 0xcf, 0xa2, 0xad, 0x3e, 0x8b, 0x36,
0x81, 0x9b, 0x30, 0x9c, 0xeb, 0x36, 0x07, 0xb3, 0x24, 0xc8, 0x18, 0x6d, 0x81, 0x5c, 0x92, 0x75, 0x91, 0xb6, 0x8e, 0x9f, 0x30, 0x9c, 0xe9, 0x36, 0x0f, 0xb3, 0x64, 0x38, 0x61, 0x34, 0x05, 0x72,
0xe3, 0x4b, 0x68, 0xbd, 0x22, 0xbe, 0x3f, 0x1b, 0x8c, 0x75, 0x46, 0xc6, 0x29, 0x8c, 0xdb, 0x8e, 0xc9, 0xa4, 0x1b, 0x5f, 0x42, 0xe3, 0x15, 0x09, 0x82, 0xe9, 0x54, 0xac, 0x32, 0xd2, 0x4f, 0x61,
0xa6, 0x44, 0xee, 0x5c, 0xdf, 0x97, 0x09, 0x6d, 0x38, 0xe2, 0x78, 0x3b, 0x9b, 0xd6, 0x47, 0xb0, 0xdc, 0xf4, 0x34, 0x25, 0x72, 0xe7, 0x07, 0x81, 0x4c, 0x68, 0xcd, 0x13, 0xc7, 0xbb, 0xd9, 0xb4,
0x7a, 0xe0, 0x53, 0x86, 0x4f, 0x44, 0x50, 0xc5, 0xbd, 0xf3, 0x31, 0xac, 0x0c, 0xd2, 0x84, 0xdc, 0x3f, 0x85, 0xb5, 0xc3, 0x80, 0x32, 0x7c, 0x2a, 0x82, 0xca, 0xef, 0x9d, 0xcf, 0x60, 0xb5, 0x93,
0x33, 0x8f, 0xad, 0x63, 0x58, 0xcd, 0xc9, 0xea, 0xba, 0xcf, 0x15, 0xc0, 0x78, 0x50, 0x01, 0xac, 0x26, 0x64, 0xce, 0x30, 0xb6, 0x4f, 0x60, 0x2d, 0x23, 0xab, 0xeb, 0x3e, 0x53, 0x00, 0xe3, 0x41,
0xdf, 0x0d, 0x58, 0x9d, 0xcd, 0xaf, 0xf4, 0x79, 0x04, 0xb5, 0xc8, 0xe5, 0x5e, 0xda, 0x28, 0xe2, 0x05, 0xb0, 0xff, 0x30, 0x60, 0x6d, 0x3a, 0xbf, 0xd2, 0xe7, 0x11, 0x54, 0x22, 0x9f, 0x0f, 0xd2,
0x8c, 0xde, 0xc2, 0x22, 0x8d, 0x38, 0xa1, 0xa1, 0x18, 0x36, 0xe2, 0x8d, 0x17, 0xf6, 0x7d, 0x1b, 0x46, 0x11, 0x67, 0xf4, 0x16, 0x96, 0x68, 0xc4, 0x09, 0x0d, 0xc5, 0xb0, 0x11, 0x6f, 0xbc, 0x70,
0xd5, 0xbe, 0x65, 0xd9, 0x3e, 0x56, 0x26, 0x8e, 0x42, 0x1e, 0x4f, 0x9d, 0xd4, 0x60, 0x67, 0x17, 0xe6, 0x2d, 0x52, 0xe7, 0x8e, 0x65, 0xe7, 0x44, 0x99, 0x38, 0x0e, 0x79, 0x3c, 0xf6, 0x52, 0x83,
0x96, 0xf2, 0x17, 0x22, 0x49, 0x17, 0x78, 0xaa, 0x9f, 0x17, 0x47, 0x01, 0x94, 0x89, 0xeb, 0x27, 0xd6, 0x1e, 0x2c, 0x67, 0x2f, 0x44, 0x92, 0x2e, 0xf1, 0x58, 0x3f, 0x2f, 0x8e, 0x02, 0x28, 0x23,
0x29, 0x84, 0x15, 0xb1, 0x5b, 0xf9, 0xc2, 0xe8, 0xff, 0xd2, 0x82, 0xda, 0x89, 0x47, 0x02, 0x74, 0x3f, 0x48, 0x52, 0x08, 0x2b, 0x62, 0xaf, 0xf4, 0x95, 0xd1, 0xfe, 0xb5, 0x01, 0x95, 0xd3, 0x01,
0x01, 0x75, 0x35, 0x7b, 0x51, 0xaf, 0x84, 0x67, 0xf9, 0xf5, 0xd7, 0x79, 0x5e, 0x5e, 0x41, 0xe7, 0x19, 0xa2, 0x4b, 0xa8, 0xaa, 0xd9, 0x8b, 0xdc, 0x02, 0x9e, 0x65, 0x77, 0x9f, 0xf5, 0xac, 0xb8,
0xfc, 0x18, 0x16, 0xe4, 0x10, 0x47, 0xf6, 0xfd, 0xaa, 0xf9, 0x69, 0xdf, 0x59, 0xbf, 0x35, 0xa9, 0x82, 0xce, 0xf9, 0x09, 0x2c, 0xca, 0x21, 0x8e, 0x9c, 0xf9, 0xaa, 0xd9, 0x69, 0x6f, 0x6d, 0xdc,
0x8e, 0xc4, 0xa7, 0x84, 0xf0, 0x5e, 0xcd, 0xda, 0x32, 0xde, 0xcf, 0xed, 0x8b, 0x32, 0xde, 0xdf, 0x99, 0x54, 0xc7, 0xe2, 0x0b, 0x42, 0x78, 0xaf, 0x66, 0x6d, 0x11, 0xef, 0x67, 0xf6, 0x45, 0x11,
0x58, 0x27, 0xd3, 0x74, 0xe5, 0x68, 0x44, 0xa0, 0xcf, 0xcb, 0x9a, 0x98, 0xdf, 0x04, 0x8f, 0x78, 0xef, 0x6f, 0xad, 0x93, 0x71, 0xba, 0x72, 0x34, 0x22, 0xd0, 0xf3, 0xa2, 0x26, 0x66, 0x37, 0xc1,
0xda, 0x93, 0x89, 0xe3, 0xb8, 0x64, 0xe2, 0x66, 0x51, 0xf6, 0x4a, 0xcb, 0xeb, 0x97, 0x38, 0x34, 0x23, 0x9e, 0x1e, 0xc8, 0xc4, 0x71, 0x5c, 0x30, 0x71, 0xd3, 0x28, 0xdd, 0xc2, 0xf2, 0xfa, 0x25,
0xb3, 0x5e, 0x41, 0xfd, 0xfb, 0xb5, 0x6f, 0x36, 0x61, 0x67, 0xe7, 0x41, 0x3a, 0x33, 0x60, 0xc8, 0x0e, 0xf5, 0x49, 0xaf, 0xa0, 0xf6, 0x7c, 0xed, 0xdb, 0x4d, 0x68, 0xed, 0x3e, 0x48, 0x67, 0x0a,
0x79, 0x53, 0x26, 0xbe, 0xfc, 0x60, 0x2a, 0x04, 0xc6, 0x37, 0x50, 0x57, 0x03, 0xab, 0x0c, 0x30, 0x0c, 0x39, 0x6f, 0x8a, 0xc4, 0x97, 0x1d, 0x4c, 0xb9, 0xc0, 0xf8, 0x16, 0xaa, 0x6a, 0x60, 0x15,
0xe6, 0x46, 0x5b, 0xa1, 0xc9, 0xef, 0x00, 0x66, 0x9d, 0x89, 0x76, 0x1e, 0xd1, 0xc7, 0x85, 0xa6, 0x01, 0xc6, 0xcc, 0x68, 0xcb, 0x35, 0xf9, 0x3d, 0xc0, 0xb4, 0x33, 0xd1, 0xee, 0x23, 0xfa, 0x38,
0x5f, 0x43, 0x4d, 0x4c, 0x53, 0xf4, 0xd9, 0xfd, 0x46, 0x73, 0x53, 0xb7, 0xd0, 0xdc, 0xb7, 0x50, 0xd7, 0xf4, 0x6b, 0xa8, 0x88, 0x69, 0x8a, 0xbe, 0x9c, 0x6f, 0x34, 0x33, 0x75, 0x73, 0xcd, 0x7d,
0x57, 0x5b, 0xb0, 0x4c, 0xf0, 0x73, 0xfb, 0xb2, 0x73, 0xf7, 0xb7, 0x9f, 0x94, 0x79, 0x6e, 0x08, 0x07, 0x55, 0xb5, 0x05, 0x8b, 0x04, 0x3f, 0xb3, 0x2f, 0x2d, 0xeb, 0xde, 0x11, 0x28, 0x65, 0x9e,
0x3f, 0xc5, 0x98, 0x2f, 0xe3, 0x67, 0x6e, 0x1d, 0x14, 0xfa, 0x89, 0x45, 0xd8, 0x78, 0x58, 0x2e, 0x19, 0xc2, 0x4f, 0x31, 0xe6, 0x8b, 0xf8, 0x99, 0x59, 0x07, 0xb9, 0x7e, 0x62, 0x11, 0x36, 0xee,
0xec, 0xec, 0x33, 0xa9, 0x63, 0x97, 0x15, 0xd7, 0xe0, 0x7a, 0x05, 0xd5, 0x01, 0x9f, 0xa2, 0x4f, 0x16, 0x0b, 0x7b, 0xf2, 0x99, 0x64, 0x39, 0x45, 0xc5, 0x35, 0xb8, 0x5e, 0x41, 0xb9, 0xc3, 0xc7,
0x4b, 0x40, 0x2b, 0xfb, 0x12, 0xf9, 0x4f, 0x14, 0x64, 0xeb, 0xa9, 0x14, 0x0a, 0x6e, 0x2e, 0xb3, 0xe8, 0x8b, 0x02, 0xd0, 0x9a, 0x7c, 0x89, 0xfc, 0x2f, 0x0a, 0x26, 0xeb, 0xa9, 0x10, 0x0a, 0x6e,
0x22, 0xd3, 0xfb, 0x6f, 0xae, 0xde, 0x77, 0x9f, 0xfc, 0xf5, 0xbe, 0xfb, 0xe4, 0xc7, 0xeb, 0xae, 0x2f, 0xb3, 0x3c, 0xd3, 0x07, 0x6f, 0xae, 0xdf, 0xb7, 0x16, 0xfe, 0x7e, 0xdf, 0x5a, 0xf8, 0xe9,
0x71, 0x75, 0xdd, 0x35, 0xfe, 0xb8, 0xee, 0x1a, 0xff, 0x5c, 0x77, 0x8d, 0xb7, 0xbb, 0x8f, 0xfa, 0xa6, 0x65, 0x5c, 0xdf, 0xb4, 0x8c, 0x3f, 0x6f, 0x5a, 0xc6, 0xbf, 0x37, 0x2d, 0xe3, 0xed, 0xde,
0x3f, 0xee, 0x4b, 0xf1, 0x7b, 0x56, 0x97, 0xaf, 0xec, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x99, 0xa3, 0xfe, 0x7d, 0xfb, 0x5a, 0xfc, 0x9e, 0x57, 0xe5, 0x2b, 0xbb, 0xff, 0x05, 0x00, 0x00, 0xff,
0x1c, 0x92, 0x1a, 0x0c, 0x0e, 0x00, 0x00, 0xff, 0x0b, 0x95, 0x7e, 0x52, 0x03, 0x0e, 0x00, 0x00,
} }

4
api/services/shim/v1/shim.proto
View File

@ -5,7 +5,7 @@ package containerd.runtime.linux.shim.v1;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/api/types/mount/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/task/task.proto"; import "github.com/containerd/containerd/api/types/task/task.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
@ -43,7 +43,7 @@ message CreateRequest {
string stdin = 6; string stdin = 6;
string stdout = 7; string stdout = 7;
string stderr = 8; string stderr = 8;
repeated containerd.v1.types.Mount rootfs = 9; repeated containerd.types.Mount rootfs = 9;
string checkpoint = 10; string checkpoint = 10;
string parent_checkpoint = 11; string parent_checkpoint = 11;
} }

113
api/services/snapshot/v1/snapshots.pb.go
View File

@ -32,7 +32,7 @@ import fmt "fmt"
import math "math" import math "math"
import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/gogo/protobuf/gogoproto"
import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
import containerd_v1_types "github.com/containerd/containerd/api/types/mount" import containerd_types "github.com/containerd/containerd/api/types"
import ( import (
context "golang.org/x/net/context" context "golang.org/x/net/context"
@ -86,7 +86,7 @@ func (*PrepareSnapshotRequest) ProtoMessage() {}
func (*PrepareSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{0} } func (*PrepareSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{0} }
type PrepareSnapshotResponse struct { type PrepareSnapshotResponse struct {
Mounts []*containerd_v1_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"` Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`
} }
func (m *PrepareSnapshotResponse) Reset() { *m = PrepareSnapshotResponse{} } func (m *PrepareSnapshotResponse) Reset() { *m = PrepareSnapshotResponse{} }
@ -103,7 +103,7 @@ func (*ViewSnapshotRequest) ProtoMessage() {}
func (*ViewSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{2} } func (*ViewSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{2} }
type ViewSnapshotResponse struct { type ViewSnapshotResponse struct {
Mounts []*containerd_v1_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"` Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`
} }
func (m *ViewSnapshotResponse) Reset() { *m = ViewSnapshotResponse{} } func (m *ViewSnapshotResponse) Reset() { *m = ViewSnapshotResponse{} }
@ -119,7 +119,7 @@ func (*MountsRequest) ProtoMessage() {}
func (*MountsRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{4} } func (*MountsRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{4} }
type MountsResponse struct { type MountsResponse struct {
Mounts []*containerd_v1_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"` Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`
} }
func (m *MountsResponse) Reset() { *m = MountsResponse{} } func (m *MountsResponse) Reset() { *m = MountsResponse{} }
@ -1207,7 +1207,7 @@ func (this *PrepareSnapshotResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&PrepareSnapshotResponse{`, s := strings.Join([]string{`&PrepareSnapshotResponse{`,
`Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_types.Mount", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1228,7 +1228,7 @@ func (this *ViewSnapshotResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ViewSnapshotResponse{`, s := strings.Join([]string{`&ViewSnapshotResponse{`,
`Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_types.Mount", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1248,7 +1248,7 @@ func (this *MountsResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&MountsResponse{`, s := strings.Join([]string{`&MountsResponse{`,
`Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_types.Mount", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1518,7 +1518,7 @@ func (m *PrepareSnapshotResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Mounts = append(m.Mounts, &containerd_v1_types.Mount{}) m.Mounts = append(m.Mounts, &containerd_types.Mount{})
if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -1707,7 +1707,7 @@ func (m *ViewSnapshotResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Mounts = append(m.Mounts, &containerd_v1_types.Mount{}) m.Mounts = append(m.Mounts, &containerd_types.Mount{})
if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -1867,7 +1867,7 @@ func (m *MountsResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Mounts = append(m.Mounts, &containerd_v1_types.Mount{}) m.Mounts = append(m.Mounts, &containerd_types.Mount{})
if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -2794,51 +2794,50 @@ func init() {
} }
var fileDescriptorSnapshots = []byte{ var fileDescriptorSnapshots = []byte{
// 725 bytes of a gzipped FileDescriptorProto // 720 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x52, 0xd3, 0x5e, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0xd3, 0x4c,
0x14, 0x6e, 0x68, 0x7e, 0x05, 0x0e, 0x7f, 0x86, 0xdf, 0xa5, 0xd4, 0x4e, 0x9c, 0x89, 0x31, 0x0b, 0x10, 0x8e, 0x1b, 0xbf, 0x69, 0x3b, 0xfd, 0x50, 0xdf, 0x6d, 0x9a, 0x46, 0x7e, 0x25, 0xbf, 0xc6,
0xad, 0x2e, 0x12, 0xa8, 0xa3, 0xa8, 0xe8, 0x28, 0x05, 0x16, 0x15, 0x3b, 0x3a, 0x01, 0x19, 0x71, 0x07, 0x08, 0x1c, 0xec, 0xb6, 0x88, 0x16, 0xa8, 0x10, 0x34, 0xa5, 0x42, 0xa1, 0x54, 0x20, 0xb7,
0xdc, 0x84, 0xf6, 0x52, 0x32, 0x90, 0xdc, 0xd8, 0x7b, 0x5b, 0xa7, 0x2e, 0x1c, 0xdd, 0x39, 0xbc, 0x54, 0x14, 0x71, 0x71, 0x93, 0x6d, 0x6a, 0xb5, 0xf6, 0x9a, 0xec, 0x26, 0x28, 0x1c, 0x10, 0xdc,
0x03, 0x2b, 0x7d, 0x0a, 0x9f, 0x80, 0xa5, 0x4b, 0x57, 0x8e, 0xf4, 0x49, 0x9c, 0xdc, 0xdc, 0x16, 0x50, 0xff, 0x43, 0x4f, 0xf0, 0x2b, 0xf8, 0x05, 0x3d, 0x72, 0xe4, 0x84, 0x68, 0x7e, 0x09, 0xda,
0x0a, 0xe9, 0x24, 0x94, 0x4d, 0xe7, 0xdc, 0x93, 0xf3, 0x7d, 0xdf, 0xc9, 0x39, 0x39, 0xe7, 0x16, 0xf5, 0x26, 0xfd, 0x72, 0x64, 0x37, 0xb7, 0xd9, 0xdd, 0x79, 0x9e, 0x67, 0x76, 0xc6, 0x33, 0x6b,
0xca, 0x75, 0x87, 0xed, 0x35, 0x77, 0x8c, 0x2a, 0x71, 0xcd, 0x2a, 0xf1, 0x98, 0xed, 0x78, 0xb8, 0xa8, 0xd4, 0x3d, 0xb6, 0xdf, 0xdc, 0xb5, 0xaa, 0xc4, 0xb7, 0xab, 0x24, 0x60, 0xae, 0x17, 0xe0,
0x51, 0x3b, 0x6b, 0xda, 0xbe, 0x63, 0x52, 0xdc, 0x68, 0x39, 0x55, 0x4c, 0x4d, 0xea, 0xd9, 0x3e, 0x46, 0xed, 0xbc, 0xe9, 0x86, 0x9e, 0x4d, 0x71, 0xa3, 0xe5, 0x55, 0x31, 0xb5, 0x69, 0xe0, 0x86,
0xdd, 0x23, 0xcc, 0x6c, 0x2d, 0xf4, 0x6c, 0x6a, 0xf8, 0x0d, 0xc2, 0x08, 0xd2, 0x4e, 0x41, 0x46, 0x74, 0x9f, 0x30, 0xbb, 0x35, 0xdf, 0xb3, 0xa9, 0x15, 0x36, 0x08, 0x23, 0xc8, 0x38, 0x03, 0x59,
0x17, 0x60, 0x9c, 0x06, 0xb5, 0x16, 0x94, 0x6c, 0x9d, 0xd4, 0x09, 0x0f, 0x36, 0x03, 0x2b, 0xc4, 0x5d, 0x80, 0x75, 0xe6, 0xd4, 0x9a, 0xd7, 0xf2, 0x75, 0x52, 0x27, 0xc2, 0xd9, 0xe6, 0x56, 0x84,
0x29, 0xd7, 0xeb, 0x84, 0xd4, 0x0f, 0xb0, 0xc9, 0x4f, 0x3b, 0xcd, 0x5d, 0x13, 0xbb, 0x3e, 0x6b, 0xd3, 0xfe, 0xab, 0x13, 0x52, 0x3f, 0xc4, 0xb6, 0x58, 0xed, 0x36, 0xf7, 0x6c, 0xec, 0x87, 0xac,
0x8b, 0x87, 0x4f, 0x12, 0xe5, 0xc7, 0xda, 0x3e, 0xa6, 0xa6, 0x4b, 0x9a, 0x1e, 0x0b, 0x7f, 0x43, 0x2d, 0x0f, 0x17, 0x53, 0xc5, 0xc7, 0xda, 0x21, 0xa6, 0xb6, 0x4f, 0x9a, 0x01, 0x8b, 0x70, 0x66,
0xb4, 0x5e, 0x82, 0xdc, 0xeb, 0x06, 0xf6, 0xed, 0x06, 0xde, 0x10, 0x79, 0x58, 0xf8, 0x43, 0x13, 0x19, 0x0a, 0xaf, 0x1a, 0x38, 0x74, 0x1b, 0x78, 0x53, 0x46, 0xe0, 0xe0, 0xf7, 0x4d, 0x4c, 0x19,
0x53, 0x86, 0x66, 0x20, 0xbd, 0x8f, 0xdb, 0x79, 0x49, 0x93, 0x0a, 0xe3, 0x56, 0x60, 0xa2, 0x1c, 0x9a, 0x82, 0xec, 0x01, 0x6e, 0x17, 0x15, 0x43, 0x29, 0x8d, 0x3a, 0xdc, 0x44, 0x05, 0xc8, 0x71,
0x64, 0x82, 0x40, 0x8f, 0xe5, 0x47, 0xb8, 0x53, 0x9c, 0xf4, 0x0a, 0x5c, 0xbb, 0xc0, 0x41, 0x7d, 0xc7, 0x80, 0x15, 0x87, 0xc4, 0xa6, 0x5c, 0x99, 0xcf, 0x61, 0xf6, 0x0a, 0x07, 0x0d, 0x49, 0x40,
0xe2, 0x51, 0x8c, 0x8a, 0x90, 0xe1, 0x6a, 0x34, 0x2f, 0x69, 0xe9, 0xc2, 0x44, 0x51, 0x31, 0xce, 0x31, 0xb2, 0x21, 0x27, 0xd4, 0x68, 0x51, 0x31, 0xb2, 0xa5, 0xb1, 0x85, 0x59, 0xeb, 0xdc, 0xe5,
0x94, 0xa0, 0xb5, 0x60, 0xf0, 0xb4, 0x8c, 0x4a, 0x10, 0x62, 0x89, 0x48, 0xfd, 0x19, 0xcc, 0x6e, 0x45, 0x34, 0xd6, 0x06, 0x3f, 0x77, 0xa4, 0x9b, 0xf9, 0x18, 0xa6, 0xb7, 0x3d, 0xfc, 0x61, 0xf0,
0x39, 0xf8, 0xe3, 0xf0, 0xf9, 0xbc, 0x80, 0x6c, 0x3f, 0xc1, 0x15, 0x92, 0xb9, 0x09, 0x53, 0xdc, 0x60, 0x9e, 0x41, 0xfe, 0x22, 0xc1, 0xa0, 0x91, 0xdc, 0x80, 0x09, 0xb1, 0x41, 0xfb, 0xc6, 0x60,
0x41, 0x07, 0xa6, 0xa1, 0xaf, 0xc2, 0x74, 0x37, 0xe4, 0x0a, 0x42, 0x77, 0x60, 0xce, 0xc2, 0x2e, 0xae, 0xc0, 0x64, 0xd7, 0x65, 0x50, 0x95, 0xdb, 0x30, 0xe3, 0x60, 0x9f, 0xb4, 0x92, 0xd3, 0x6f,
0x69, 0xc5, 0xf7, 0x41, 0x7f, 0x0a, 0x73, 0x2b, 0xc4, 0x75, 0x1d, 0x76, 0x3e, 0x14, 0x81, 0xec, 0x3e, 0x82, 0x99, 0x55, 0xe2, 0xfb, 0x1e, 0xbb, 0xec, 0x8a, 0x40, 0x0d, 0x5c, 0x1f, 0x4b, 0x5f,
0xd9, 0x2e, 0x16, 0xb1, 0xdc, 0xee, 0xc2, 0x47, 0x4e, 0xe1, 0xb7, 0x61, 0x76, 0x83, 0xd9, 0x2c, 0x61, 0x77, 0xe1, 0x43, 0x67, 0xf0, 0x5b, 0x30, 0xbd, 0xc9, 0x5c, 0x96, 0xac, 0x73, 0xa4, 0x80,
0x5e, 0xe7, 0x50, 0x02, 0xb9, 0xec, 0xed, 0x92, 0x48, 0xde, 0x01, 0xc5, 0x47, 0x8f, 0x41, 0xde, 0x5a, 0x09, 0xf6, 0x48, 0x2c, 0x6f, 0x9f, 0xb4, 0xa3, 0x87, 0xa0, 0x1e, 0x78, 0x41, 0xad, 0x98,
0x77, 0xbc, 0x5a, 0x3e, 0xad, 0x49, 0x85, 0xe9, 0xe2, 0x2d, 0x23, 0xee, 0x93, 0x37, 0xd6, 0x1d, 0x35, 0x94, 0xd2, 0xe4, 0xc2, 0x4d, 0x2b, 0xe9, 0x1b, 0xb7, 0xd6, 0xbd, 0xa0, 0xe6, 0x08, 0x0c,
0xaf, 0x66, 0x71, 0x0c, 0x52, 0x60, 0xac, 0x81, 0xed, 0x1a, 0xf1, 0x0e, 0xda, 0x79, 0x59, 0x93, 0xd2, 0x60, 0xa4, 0x81, 0xdd, 0x1a, 0x09, 0x0e, 0xdb, 0x45, 0xd5, 0x50, 0x4a, 0x23, 0x4e, 0x6f,
0x0a, 0x63, 0x56, 0xef, 0xac, 0xbf, 0x85, 0x6c, 0x7f, 0xd6, 0xa2, 0xd6, 0xcf, 0x41, 0x76, 0xbc, 0x6d, 0xbe, 0x81, 0xfc, 0xc5, 0xa8, 0x65, 0xa2, 0x9f, 0x80, 0xea, 0x05, 0x7b, 0x44, 0xc4, 0x36,
0x5d, 0xc2, 0x73, 0x9b, 0x48, 0xa2, 0x17, 0xbc, 0x51, 0x49, 0x3e, 0xfe, 0x73, 0x23, 0x65, 0x71, 0x96, 0x46, 0x8f, 0xdf, 0xa8, 0xac, 0x9e, 0xfc, 0xfe, 0x3f, 0xe3, 0x08, 0xa4, 0x59, 0x80, 0xfc,
0xa4, 0x9e, 0x83, 0xec, 0x4b, 0x87, 0xf6, 0x98, 0xbb, 0x9d, 0xd6, 0xb7, 0x61, 0xee, 0x9c, 0xff, 0x0b, 0x8f, 0xf6, 0x98, 0xbb, 0x65, 0x36, 0x77, 0x60, 0xe6, 0xd2, 0xfe, 0x15, 0xc9, 0xec, 0x80,
0x82, 0x64, 0x7a, 0x48, 0x49, 0x0d, 0x26, 0xdf, 0x50, 0xbb, 0x8e, 0x07, 0xd7, 0x7e, 0x09, 0xa6, 0x92, 0x06, 0x8c, 0xbf, 0xa6, 0x6e, 0x1d, 0xf7, 0xcf, 0xfd, 0x32, 0x4c, 0x48, 0x0f, 0x29, 0x8a,
0x44, 0x84, 0x10, 0x45, 0x20, 0x53, 0xe7, 0x53, 0xd8, 0x83, 0xb4, 0xc5, 0xed, 0xa0, 0x07, 0x8e, 0x40, 0xa5, 0xde, 0xc7, 0xa8, 0x06, 0x59, 0x47, 0xd8, 0xbc, 0x06, 0x5e, 0x40, 0x6a, 0x98, 0x8a,
0x47, 0x6a, 0x98, 0xf2, 0x1e, 0xa4, 0x2d, 0x71, 0xba, 0x6b, 0x81, 0xbc, 0x1e, 0xd6, 0x33, 0xb3, 0x1a, 0x64, 0x1d, 0xb9, 0xba, 0xe3, 0x80, 0xba, 0x1e, 0xe5, 0x33, 0xb7, 0xb2, 0xba, 0x55, 0xd9,
0xbc, 0xb2, 0x59, 0xde, 0x5a, 0x9b, 0x49, 0x29, 0xd3, 0x87, 0x47, 0x1a, 0x04, 0xde, 0xe5, 0x2a, 0x5e, 0x9b, 0xca, 0x68, 0x93, 0x47, 0xc7, 0x06, 0xf0, 0xdd, 0x95, 0x2a, 0xf3, 0x5a, 0x18, 0x19,
0x73, 0x5a, 0x18, 0x69, 0x30, 0xbe, 0xf2, 0xaa, 0x52, 0x29, 0x6f, 0x6e, 0xae, 0xad, 0xce, 0x48, 0x30, 0xba, 0xfa, 0x72, 0x63, 0xa3, 0xb2, 0xb5, 0xb5, 0xf6, 0x74, 0x4a, 0xd1, 0xfe, 0x3d, 0x3a,
0xca, 0xff, 0x87, 0x47, 0xda, 0x54, 0xf0, 0x38, 0xfc, 0xb2, 0x18, 0xae, 0x29, 0x93, 0xdf, 0xbe, 0x36, 0x26, 0xf8, 0x71, 0xf4, 0x65, 0x31, 0x5c, 0xd3, 0xc6, 0xbf, 0x7e, 0xd3, 0x33, 0x3f, 0xbe,
0xab, 0xa9, 0x9f, 0x3f, 0x54, 0xce, 0x55, 0xfc, 0x3a, 0x0a, 0xe3, 0xbd, 0x52, 0xa0, 0xcf, 0x30, 0xeb, 0x82, 0x6b, 0xe1, 0xcb, 0x30, 0x8c, 0xf6, 0x52, 0x81, 0x3e, 0xc1, 0xb0, 0xec, 0x74, 0x74,
0x2a, 0x46, 0x1e, 0x3d, 0x8c, 0x7f, 0xff, 0xe8, 0x0d, 0xa3, 0x3c, 0x1a, 0x02, 0x29, 0xaa, 0xd1, 0x3f, 0xf9, 0xfe, 0xf1, 0x83, 0x45, 0x7b, 0x30, 0x00, 0x52, 0x66, 0xa3, 0x09, 0x2a, 0x6f, 0x6e,
0x04, 0x39, 0x18, 0x71, 0x74, 0x3f, 0x9e, 0x22, 0x62, 0x97, 0x28, 0x0f, 0x2e, 0x0b, 0x13, 0xb2, 0x74, 0x2f, 0x99, 0x22, 0x66, 0x8a, 0x68, 0x8b, 0xd7, 0x85, 0x49, 0xd9, 0x03, 0xc8, 0x45, 0x7d,
0xfb, 0x90, 0x09, 0x47, 0x1d, 0x99, 0xf1, 0x0c, 0x7d, 0x7b, 0x43, 0x99, 0x4f, 0x0e, 0x10, 0x62, 0x8e, 0xec, 0x64, 0x86, 0x0b, 0x43, 0x43, 0x9b, 0x4b, 0x0f, 0x90, 0x62, 0x3b, 0x90, 0x8b, 0x8a,
0xdb, 0x90, 0x09, 0x9b, 0x81, 0x16, 0xe3, 0xb1, 0x91, 0x0b, 0x41, 0xc9, 0x19, 0xe1, 0xcd, 0x61, 0x81, 0x96, 0x92, 0xb1, 0xb1, 0x03, 0x41, 0x2b, 0x58, 0xd1, 0x53, 0x61, 0x75, 0x9f, 0x0a, 0x6b,
0x74, 0x6f, 0x0e, 0x63, 0x2d, 0xb8, 0x39, 0x02, 0xea, 0x70, 0xd9, 0x24, 0xa1, 0x8e, 0x5c, 0x4b, 0x8d, 0x3f, 0x15, 0x9c, 0x3a, 0x1a, 0x36, 0x69, 0xa8, 0x63, 0xc7, 0x52, 0x5f, 0xea, 0x26, 0xa8,
0x03, 0xa9, 0x9b, 0x20, 0x07, 0x73, 0x9a, 0xa4, 0x33, 0x11, 0x5b, 0x28, 0x49, 0x67, 0x22, 0xd7, 0xbc, 0x4f, 0xd3, 0x54, 0x26, 0x66, 0x0a, 0xa5, 0xa9, 0x4c, 0xec, 0x18, 0x68, 0x83, 0xca, 0x9b,
0x40, 0x1b, 0xe4, 0x60, 0x58, 0x51, 0x02, 0x7c, 0xd4, 0xb0, 0x2b, 0x8b, 0x97, 0xc6, 0x85, 0xc2, 0x15, 0xa5, 0xc0, 0xc7, 0x35, 0xbb, 0xb6, 0x74, 0x6d, 0x5c, 0x24, 0x3c, 0xa7, 0xa0, 0x7d, 0xf8,
0xf3, 0x12, 0xda, 0x83, 0xff, 0xf8, 0xa8, 0x22, 0x23, 0x9e, 0xe3, 0xec, 0xd4, 0x2b, 0x66, 0xe2, 0x47, 0xb4, 0x2a, 0xb2, 0x92, 0x39, 0xce, 0x77, 0xbd, 0x66, 0xa7, 0xf6, 0x8f, 0xb4, 0xca, 0xef,
0xf8, 0x50, 0xab, 0xf4, 0xfe, 0xf8, 0x44, 0x4d, 0xfd, 0x3e, 0x51, 0x53, 0x5f, 0x3a, 0xaa, 0x74, 0x4e, 0x4e, 0xf5, 0xcc, 0xaf, 0x53, 0x3d, 0xf3, 0xb9, 0xa3, 0x2b, 0x27, 0x1d, 0x5d, 0xf9, 0xd9,
0xdc, 0x51, 0xa5, 0x5f, 0x1d, 0x55, 0xfa, 0xdb, 0x51, 0xa5, 0x77, 0xa5, 0xa1, 0xff, 0xa4, 0x2c, 0xd1, 0x95, 0x3f, 0x1d, 0x5d, 0x79, 0x5b, 0x1e, 0xf8, 0xaf, 0x64, 0xb9, 0x6b, 0xef, 0xe6, 0x44,
0x75, 0xed, 0x9d, 0x0c, 0xef, 0xe4, 0xbd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x22, 0x50, 0x02, 0x25, 0xef, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x03, 0x65, 0xd8, 0x3b, 0xe2, 0x08, 0x00, 0x00,
0x42, 0xf1, 0x08, 0x00, 0x00,
} }

8
api/services/snapshot/v1/snapshots.proto
View File

@ -4,7 +4,7 @@ package containerd.services.snapshots.v1;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "github.com/containerd/containerd/api/types/mount/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
option go_package = "github.com/containerd/containerd/api/services/snapshot/v1;snapshot"; option go_package = "github.com/containerd/containerd/api/services/snapshot/v1;snapshot";
@ -26,7 +26,7 @@ message PrepareSnapshotRequest {
} }
message PrepareSnapshotResponse { message PrepareSnapshotResponse {
repeated containerd.v1.types.Mount mounts = 1; repeated containerd.types.Mount mounts = 1;
} }
message ViewSnapshotRequest { message ViewSnapshotRequest {
@ -35,7 +35,7 @@ message ViewSnapshotRequest {
} }
message ViewSnapshotResponse { message ViewSnapshotResponse {
repeated containerd.v1.types.Mount mounts = 1; repeated containerd.types.Mount mounts = 1;
} }
message MountsRequest { message MountsRequest {
@ -43,7 +43,7 @@ message MountsRequest {
} }
message MountsResponse { message MountsResponse {
repeated containerd.v1.types.Mount mounts = 1; repeated containerd.types.Mount mounts = 1;
} }
message RemoveSnapshotRequest { message RemoveSnapshotRequest {

202
api/services/tasks/v1/tasks.pb.go
View File

@ -39,9 +39,9 @@ import math "math"
import google_protobuf "github.com/golang/protobuf/ptypes/empty" import google_protobuf "github.com/golang/protobuf/ptypes/empty"
import google_protobuf1 "github.com/gogo/protobuf/types" import google_protobuf1 "github.com/gogo/protobuf/types"
import _ "github.com/gogo/protobuf/gogoproto" import _ "github.com/gogo/protobuf/gogoproto"
import containerd_v1_types "github.com/containerd/containerd/api/types/mount" import containerd_types "github.com/containerd/containerd/api/types"
import containerd_v1_types1 "github.com/containerd/containerd/api/types/descriptor" import containerd_types1 "github.com/containerd/containerd/api/types"
import containerd_v1_types2 "github.com/containerd/containerd/api/types/task" import containerd_v1_types "github.com/containerd/containerd/api/types/task"
import _ "github.com/gogo/protobuf/types" import _ "github.com/gogo/protobuf/types"
import time "time" import time "time"
@ -85,12 +85,12 @@ type CreateTaskRequest struct {
// These are for mounts that cannot be performed in the user namespace. // These are for mounts that cannot be performed in the user namespace.
// Typically, these mounts should be resolved from snapshots specified on // Typically, these mounts should be resolved from snapshots specified on
// the container object. // the container object.
Rootfs []*containerd_v1_types.Mount `protobuf:"bytes,3,rep,name=rootfs" json:"rootfs,omitempty"` Rootfs []*containerd_types.Mount `protobuf:"bytes,3,rep,name=rootfs" json:"rootfs,omitempty"`
Stdin string `protobuf:"bytes,4,opt,name=stdin,proto3" json:"stdin,omitempty"` Stdin string `protobuf:"bytes,4,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,5,opt,name=stdout,proto3" json:"stdout,omitempty"` Stdout string `protobuf:"bytes,5,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,6,opt,name=stderr,proto3" json:"stderr,omitempty"` Stderr string `protobuf:"bytes,6,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,7,opt,name=terminal,proto3" json:"terminal,omitempty"` Terminal bool `protobuf:"varint,7,opt,name=terminal,proto3" json:"terminal,omitempty"`
Checkpoint *containerd_v1_types1.Descriptor `protobuf:"bytes,8,opt,name=checkpoint" json:"checkpoint,omitempty"` Checkpoint *containerd_types1.Descriptor `protobuf:"bytes,8,opt,name=checkpoint" json:"checkpoint,omitempty"`
} }
func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} } func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} }
@ -151,7 +151,7 @@ func (*GetTaskRequest) ProtoMessage() {}
func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{6} } func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{6} }
type GetTaskResponse struct { type GetTaskResponse struct {
Task *containerd_v1_types2.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` Task *containerd_v1_types.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"`
} }
func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} }
@ -167,7 +167,7 @@ func (*ListTasksRequest) ProtoMessage() {}
func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{8} } func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{8} }
type ListTasksResponse struct { type ListTasksResponse struct {
Tasks []*containerd_v1_types2.Task `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"` Tasks []*containerd_v1_types.Task `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"`
} }
func (m *ListTasksResponse) Reset() { *m = ListTasksResponse{} } func (m *ListTasksResponse) Reset() { *m = ListTasksResponse{} }
@ -363,7 +363,7 @@ func (*ListProcessesRequest) ProtoMessage() {}
func (*ListProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{17} } func (*ListProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{17} }
type ListProcessesResponse struct { type ListProcessesResponse struct {
Processes []*containerd_v1_types2.Process `protobuf:"bytes,1,rep,name=processes" json:"processes,omitempty"` Processes []*containerd_v1_types.Process `protobuf:"bytes,1,rep,name=processes" json:"processes,omitempty"`
} }
func (m *ListProcessesResponse) Reset() { *m = ListProcessesResponse{} } func (m *ListProcessesResponse) Reset() { *m = ListProcessesResponse{} }
@ -381,7 +381,7 @@ func (*CheckpointTaskRequest) ProtoMessage() {}
func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{19} } func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{19} }
type CheckpointTaskResponse struct { type CheckpointTaskResponse struct {
Descriptors []*containerd_v1_types1.Descriptor `protobuf:"bytes,1,rep,name=descriptors" json:"descriptors,omitempty"` Descriptors []*containerd_types1.Descriptor `protobuf:"bytes,1,rep,name=descriptors" json:"descriptors,omitempty"`
} }
func (m *CheckpointTaskResponse) Reset() { *m = CheckpointTaskResponse{} } func (m *CheckpointTaskResponse) Reset() { *m = CheckpointTaskResponse{} }
@ -2010,12 +2010,12 @@ func (this *CreateTaskRequest) String() string {
} }
s := strings.Join([]string{`&CreateTaskRequest{`, s := strings.Join([]string{`&CreateTaskRequest{`,
`ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`,
`Rootfs:` + strings.Replace(fmt.Sprintf("%v", this.Rootfs), "Mount", "containerd_v1_types.Mount", 1) + `,`, `Rootfs:` + strings.Replace(fmt.Sprintf("%v", this.Rootfs), "Mount", "containerd_types.Mount", 1) + `,`,
`Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`, `Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`,
`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`, `Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`, `Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`, `Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
`Checkpoint:` + strings.Replace(fmt.Sprintf("%v", this.Checkpoint), "Descriptor", "containerd_v1_types1.Descriptor", 1) + `,`, `Checkpoint:` + strings.Replace(fmt.Sprintf("%v", this.Checkpoint), "Descriptor", "containerd_types1.Descriptor", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2090,7 +2090,7 @@ func (this *GetTaskResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&GetTaskResponse{`, s := strings.Join([]string{`&GetTaskResponse{`,
`Task:` + strings.Replace(fmt.Sprintf("%v", this.Task), "Task", "containerd_v1_types2.Task", 1) + `,`, `Task:` + strings.Replace(fmt.Sprintf("%v", this.Task), "Task", "containerd_v1_types.Task", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2110,7 +2110,7 @@ func (this *ListTasksResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ListTasksResponse{`, s := strings.Join([]string{`&ListTasksResponse{`,
`Tasks:` + strings.Replace(fmt.Sprintf("%v", this.Tasks), "Task", "containerd_v1_types2.Task", 1) + `,`, `Tasks:` + strings.Replace(fmt.Sprintf("%v", this.Tasks), "Task", "containerd_v1_types.Task", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2232,7 +2232,7 @@ func (this *ListProcessesResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&ListProcessesResponse{`, s := strings.Join([]string{`&ListProcessesResponse{`,
`Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types2.Process", 1) + `,`, `Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types.Process", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2264,7 +2264,7 @@ func (this *CheckpointTaskResponse) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&CheckpointTaskResponse{`, s := strings.Join([]string{`&CheckpointTaskResponse{`,
`Descriptors:` + strings.Replace(fmt.Sprintf("%v", this.Descriptors), "Descriptor", "containerd_v1_types1.Descriptor", 1) + `,`, `Descriptors:` + strings.Replace(fmt.Sprintf("%v", this.Descriptors), "Descriptor", "containerd_types1.Descriptor", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2361,7 +2361,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Rootfs = append(m.Rootfs, &containerd_v1_types.Mount{}) m.Rootfs = append(m.Rootfs, &containerd_types.Mount{})
if err := m.Rootfs[len(m.Rootfs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Rootfs[len(m.Rootfs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -2500,7 +2500,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Checkpoint == nil { if m.Checkpoint == nil {
m.Checkpoint = &containerd_v1_types1.Descriptor{} m.Checkpoint = &containerd_types1.Descriptor{}
} }
if err := m.Checkpoint.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Checkpoint.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
@ -3163,7 +3163,7 @@ func (m *GetTaskResponse) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Task == nil { if m.Task == nil {
m.Task = &containerd_v1_types2.Task{} m.Task = &containerd_v1_types.Task{}
} }
if err := m.Task.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Task.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
@ -3324,7 +3324,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Tasks = append(m.Tasks, &containerd_v1_types2.Task{}) m.Tasks = append(m.Tasks, &containerd_v1_types.Task{})
if err := m.Tasks[len(m.Tasks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Tasks[len(m.Tasks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -4323,7 +4323,7 @@ func (m *ListProcessesResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Processes = append(m.Processes, &containerd_v1_types2.Process{}) m.Processes = append(m.Processes, &containerd_v1_types.Process{})
if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Processes[len(m.Processes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -4628,7 +4628,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Descriptors = append(m.Descriptors, &containerd_v1_types1.Descriptor{}) m.Descriptors = append(m.Descriptors, &containerd_types1.Descriptor{})
if err := m.Descriptors[len(m.Descriptors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Descriptors[len(m.Descriptors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
@ -4764,80 +4764,80 @@ func init() {
} }
var fileDescriptorTasks = []byte{ var fileDescriptorTasks = []byte{
// 1192 bytes of a gzipped FileDescriptorProto // 1191 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4b, 0x53, 0xdb, 0xd6, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x4f, 0xe3, 0xc6,
0x17, 0x47, 0x7e, 0xc5, 0x1c, 0x87, 0x04, 0xf4, 0x27, 0x8c, 0xa3, 0x7f, 0xc6, 0x66, 0xb4, 0xa9, 0x17, 0xc7, 0xf9, 0xb5, 0xe1, 0x05, 0x58, 0x98, 0x2f, 0xcb, 0x37, 0xeb, 0xa2, 0x04, 0xf9, 0xd2,
0x9b, 0x69, 0xa4, 0xe2, 0x74, 0xd1, 0xa1, 0x99, 0x69, 0x00, 0x13, 0x4a, 0x1f, 0x03, 0x15, 0x99, 0x74, 0x55, 0xec, 0x12, 0xaa, 0xaa, 0x62, 0x57, 0xd5, 0x02, 0xa1, 0x94, 0xfe, 0x10, 0xd4, 0xac,
0x2e, 0x68, 0x67, 0x3c, 0xc2, 0xba, 0x98, 0x3b, 0x96, 0x25, 0x45, 0xf7, 0x9a, 0xe0, 0xae, 0xba, 0xaa, 0x0a, 0x55, 0x8a, 0x4c, 0x3c, 0x84, 0x51, 0x1c, 0xdb, 0xeb, 0x99, 0xb0, 0xa4, 0xa7, 0x9e,
0xea, 0xb6, 0xfd, 0x04, 0xfd, 0x20, 0x5d, 0x77, 0xc1, 0xb2, 0x8b, 0x2e, 0x3a, 0x5d, 0xd0, 0x86, 0x7a, 0x6d, 0x8f, 0xfd, 0x5b, 0x7a, 0xee, 0x81, 0x63, 0x0f, 0x3d, 0x54, 0x3d, 0xd0, 0x2e, 0xfd,
0x7e, 0x91, 0xce, 0x7d, 0x58, 0xc8, 0x4f, 0xd9, 0x98, 0x8d, 0xb9, 0xf7, 0xe8, 0x9c, 0x73, 0xcf, 0x47, 0xaa, 0x19, 0x4f, 0x8c, 0x93, 0x90, 0x5f, 0x84, 0x0b, 0xcc, 0x3c, 0xbf, 0xf7, 0xe6, 0xfd,
0xfb, 0x77, 0x06, 0xd8, 0x6e, 0x62, 0x7a, 0xd6, 0x39, 0x31, 0x1a, 0x7e, 0xdb, 0x6c, 0xf8, 0x1e, 0xfe, 0x3c, 0x05, 0x76, 0xea, 0x84, 0x9d, 0xb7, 0x4e, 0xf5, 0x9a, 0xd7, 0x34, 0x6a, 0x9e, 0xcb,
0xb5, 0xb1, 0x87, 0x42, 0x27, 0x7e, 0xb4, 0x03, 0x6c, 0x12, 0x14, 0x9e, 0xe3, 0x06, 0x22, 0x26, 0x2c, 0xe2, 0xe2, 0xc0, 0x8e, 0x1f, 0x2d, 0x9f, 0x18, 0x14, 0x07, 0x17, 0xa4, 0x86, 0xa9, 0xc1,
0xb5, 0x49, 0x8b, 0x98, 0xe7, 0x1b, 0xe2, 0x60, 0x04, 0xa1, 0x4f, 0x7d, 0xf5, 0xc9, 0x0d, 0xb7, 0x2c, 0xda, 0xa0, 0xc6, 0xc5, 0x46, 0x78, 0xd0, 0xfd, 0xc0, 0x63, 0x1e, 0x5a, 0xbd, 0xe5, 0xd6,
0xd1, 0xe3, 0x34, 0x04, 0xc3, 0xf9, 0x86, 0xf6, 0xff, 0xa6, 0xef, 0x37, 0x5d, 0x64, 0x72, 0xde, 0x3b, 0x9c, 0x7a, 0xc8, 0x70, 0xb1, 0xa1, 0xbe, 0x53, 0xf7, 0xbc, 0xba, 0x83, 0x0d, 0xc1, 0x7b,
0x93, 0xce, 0xa9, 0x89, 0xda, 0x01, 0xed, 0x0a, 0x51, 0xed, 0xf1, 0xe0, 0x47, 0xdb, 0xeb, 0x7d, 0xda, 0x3a, 0x33, 0x70, 0xd3, 0x67, 0xed, 0x50, 0x54, 0x7d, 0xda, 0xfb, 0xd1, 0x72, 0x3b, 0x9f,
0x5a, 0x6d, 0xfa, 0x4d, 0x9f, 0x1f, 0x4d, 0x76, 0x92, 0xd4, 0x17, 0x53, 0xd9, 0x4b, 0xbb, 0x01, 0x96, 0xeb, 0x5e, 0xdd, 0x13, 0x47, 0x83, 0x9f, 0x24, 0xf5, 0xa3, 0xb1, 0xec, 0x65, 0x6d, 0x1f,
0x22, 0x66, 0xdb, 0xef, 0x78, 0x54, 0xfc, 0x4a, 0xe9, 0x57, 0x33, 0x48, 0x3b, 0x88, 0x34, 0x42, 0x53, 0xa3, 0xe9, 0xb5, 0x5c, 0x26, 0xe5, 0x9e, 0x4f, 0x20, 0x67, 0x63, 0x5a, 0x0b, 0x88, 0xcf,
0x1c, 0x50, 0x3f, 0x8c, 0x1d, 0xa5, 0x9e, 0xcd, 0x19, 0xf4, 0xb0, 0x40, 0xf0, 0x1f, 0x29, 0x5b, 0xbc, 0x40, 0x0a, 0x6f, 0x4d, 0x20, 0xcc, 0xfd, 0x16, 0x7f, 0xa4, 0x6c, 0xb1, 0xd7, 0x43, 0x46,
0x1e, 0x74, 0x99, 0xe2, 0x36, 0x22, 0xd4, 0x6e, 0x07, 0x82, 0x41, 0xff, 0x25, 0x05, 0x2b, 0x3b, 0x9a, 0x98, 0x32, 0xab, 0xe9, 0x87, 0x0c, 0xda, 0x2f, 0x09, 0x58, 0xda, 0x0d, 0xb0, 0xc5, 0xf0,
0x21, 0xb2, 0x29, 0x7a, 0x6d, 0x93, 0x96, 0x85, 0xde, 0x74, 0x10, 0xa1, 0x6a, 0x15, 0xee, 0x47, 0x2b, 0x8b, 0x36, 0x4c, 0xfc, 0xba, 0x85, 0x29, 0x43, 0x65, 0x98, 0x8b, 0xd4, 0x57, 0x89, 0x9d,
0xea, 0xeb, 0xd8, 0x29, 0xa6, 0xd6, 0x95, 0xca, 0xe2, 0xf6, 0xc3, 0xeb, 0xab, 0x72, 0x61, 0xa7, 0x4f, 0xac, 0x29, 0xa5, 0xd9, 0x9d, 0xc7, 0x37, 0xd7, 0xc5, 0xdc, 0x6e, 0x87, 0x7e, 0x50, 0x31,
0x47, 0xdf, 0xaf, 0x59, 0x85, 0x88, 0x69, 0xdf, 0x51, 0xab, 0x90, 0x0b, 0x7d, 0x9f, 0x9e, 0x92, 0x73, 0x11, 0xd3, 0x81, 0x8d, 0x0c, 0xc8, 0x04, 0x9e, 0xc7, 0xce, 0x68, 0x3e, 0xb9, 0x96, 0x2c,
0x62, 0x7a, 0x3d, 0x5d, 0x29, 0x54, 0x35, 0x23, 0x96, 0xa9, 0xf3, 0x0d, 0x83, 0x1b, 0x68, 0x7c, 0xe5, 0xca, 0xff, 0xd7, 0x63, 0x89, 0x11, 0xd6, 0xe9, 0x5f, 0xf1, 0x90, 0x98, 0x92, 0x0d, 0x2d,
0xc5, 0x02, 0x64, 0x49, 0x4e, 0x75, 0x15, 0xb2, 0x84, 0x3a, 0xd8, 0x2b, 0x66, 0xd8, 0x03, 0x96, 0x43, 0x9a, 0x32, 0x9b, 0xb8, 0xf9, 0x14, 0xd7, 0x6e, 0x86, 0x17, 0xb4, 0x02, 0x19, 0xca, 0x6c,
0xb8, 0xa8, 0x6b, 0x90, 0x23, 0xd4, 0xf1, 0x3b, 0xb4, 0x98, 0xe5, 0x64, 0x79, 0x93, 0x74, 0x14, 0xaf, 0xc5, 0xf2, 0x69, 0x41, 0x96, 0x37, 0x49, 0xc7, 0x41, 0x90, 0xcf, 0x44, 0x74, 0x1c, 0x04,
0x86, 0xc5, 0x5c, 0x44, 0x47, 0x61, 0xa8, 0x6a, 0x90, 0xa7, 0x28, 0x6c, 0x63, 0xcf, 0x76, 0x8b, 0x48, 0x85, 0x2c, 0xc3, 0x41, 0x93, 0xb8, 0x96, 0x93, 0x7f, 0xb4, 0xa6, 0x94, 0xb2, 0x66, 0x74,
0xf7, 0xd6, 0x95, 0x4a, 0xde, 0x8a, 0xee, 0xea, 0xa7, 0x00, 0x8d, 0x33, 0xd4, 0x68, 0x05, 0x3e, 0x47, 0x2f, 0x00, 0x6a, 0xe7, 0xb8, 0xd6, 0xf0, 0x3d, 0xe2, 0xb2, 0x7c, 0x76, 0x4d, 0x29, 0xe5,
0xf6, 0x68, 0x31, 0xbf, 0xae, 0x54, 0x0a, 0xd5, 0xf2, 0x48, 0xcb, 0x6a, 0x51, 0xdc, 0xad, 0x98, 0xca, 0xab, 0xfd, 0x66, 0x55, 0xa2, 0x88, 0x9b, 0x31, 0x7e, 0xed, 0x04, 0x50, 0x3c, 0x32, 0xd4,
0x88, 0x7e, 0x0c, 0x6a, 0x3c, 0x3e, 0x24, 0xf0, 0x3d, 0x82, 0x6e, 0x15, 0xa0, 0x65, 0x48, 0x07, 0xf7, 0x5c, 0x8a, 0xef, 0x15, 0x9a, 0x45, 0x48, 0xfa, 0xc4, 0xce, 0x27, 0xd7, 0x94, 0xd2, 0xbc,
0xd8, 0x29, 0xa6, 0xd7, 0x95, 0xca, 0x92, 0xc5, 0x8e, 0xfa, 0x2b, 0x58, 0x3e, 0xa2, 0x76, 0x48, 0xc9, 0x8f, 0xda, 0xa7, 0xb0, 0x78, 0xcc, 0xac, 0x80, 0x0d, 0x0b, 0xba, 0x32, 0x5a, 0xb3, 0xb6,
0x27, 0x85, 0x5e, 0x49, 0xd6, 0xac, 0xef, 0xc1, 0x4a, 0x0d, 0xb9, 0x68, 0x72, 0x0e, 0xa7, 0x51, 0x0f, 0x4b, 0x15, 0xec, 0xe0, 0xe1, 0xd9, 0x1b, 0x47, 0xd1, 0xaf, 0x0a, 0x2c, 0x84, 0x9a, 0x06,
0xf4, 0xab, 0x02, 0x0f, 0x84, 0xa6, 0xb1, 0x9e, 0x2a, 0xd3, 0x7b, 0x9a, 0x8a, 0x3c, 0x55, 0xcb, 0x7a, 0xaa, 0x8c, 0xef, 0x69, 0x22, 0xf2, 0x14, 0x15, 0x21, 0x87, 0x2f, 0x09, 0xab, 0x52, 0x66,
0x50, 0x40, 0x17, 0x98, 0xd6, 0x09, 0xb5, 0x69, 0x87, 0xc8, 0x18, 0x00, 0x23, 0x1d, 0x71, 0x8a, 0xb1, 0x16, 0x95, 0x31, 0x00, 0x4e, 0x3a, 0x16, 0x14, 0xb4, 0x0d, 0xb3, 0xfc, 0x86, 0xed, 0xaa,
0xba, 0x05, 0x8b, 0xec, 0x86, 0x9c, 0xba, 0x4d, 0x79, 0x35, 0xb0, 0x02, 0x12, 0xc5, 0x6b, 0xf4, 0xc5, 0x44, 0x29, 0xe4, 0xca, 0xaa, 0x1e, 0x96, 0xad, 0xde, 0x29, 0x5b, 0xfd, 0x55, 0xa7, 0x6c,
0x8a, 0xd7, 0x78, 0xdd, 0x2b, 0xde, 0xed, 0xfc, 0xe5, 0x55, 0x79, 0xe1, 0xe7, 0xbf, 0xcb, 0x8a, 0x77, 0xb2, 0x57, 0xd7, 0xc5, 0x99, 0x9f, 0xff, 0x2e, 0x2a, 0x66, 0x36, 0x14, 0xdb, 0x66, 0xda,
0x95, 0x17, 0x62, 0x5b, 0x54, 0xff, 0x0e, 0x56, 0x85, 0xed, 0x87, 0xa1, 0xdf, 0x40, 0x84, 0xcc, 0x77, 0xb0, 0x1c, 0xda, 0x7e, 0x14, 0x78, 0x35, 0x4c, 0xe9, 0x14, 0x81, 0xe8, 0xf7, 0x40, 0xab,
0x11, 0x88, 0x61, 0x0f, 0xf4, 0x1a, 0x3c, 0xd8, 0x43, 0x73, 0x67, 0xea, 0x25, 0x3c, 0x8c, 0xb4, 0xc0, 0xc2, 0x3e, 0x9e, 0x3a, 0x53, 0x2f, 0xe1, 0x71, 0xa4, 0x45, 0x06, 0x78, 0x1d, 0x52, 0xbc,
0xc8, 0x00, 0x3f, 0x83, 0x0c, 0x6b, 0x58, 0x2e, 0x5e, 0xa8, 0x3e, 0x1e, 0x59, 0x9b, 0x5c, 0x80, 0x55, 0x85, 0x78, 0xae, 0xfc, 0x34, 0x5e, 0x98, 0x17, 0x1b, 0xb2, 0x36, 0x85, 0x80, 0x60, 0xd3,
0xb3, 0xe9, 0x4f, 0x61, 0xf9, 0x4b, 0x4c, 0xb8, 0x8a, 0xc8, 0xc3, 0x35, 0xc8, 0x9d, 0x62, 0x97, 0x9e, 0xc1, 0xe2, 0x97, 0x84, 0x0a, 0x15, 0x91, 0x87, 0x2b, 0x90, 0x39, 0x23, 0x0e, 0xc3, 0x41,
0xa2, 0x50, 0xd8, 0x60, 0xc9, 0x9b, 0x5e, 0x83, 0x95, 0x18, 0xaf, 0x7c, 0xcf, 0x84, 0x2c, 0x1f, 0x68, 0x83, 0x29, 0x6f, 0x5a, 0x05, 0x96, 0x62, 0xbc, 0xf2, 0x3d, 0x03, 0xd2, 0x62, 0x2e, 0xe6,
0x97, 0x45, 0x85, 0xb7, 0xe9, 0x84, 0x07, 0x05, 0x9f, 0xfe, 0x93, 0x02, 0x85, 0x2f, 0xb0, 0xeb, 0x15, 0xd1, 0xa0, 0x43, 0x1e, 0x0c, 0xf9, 0xb4, 0x9f, 0x14, 0xc8, 0x7d, 0x41, 0x1c, 0x67, 0x9a,
0xce, 0x13, 0x4f, 0xd6, 0xba, 0xb8, 0xc9, 0x1a, 0x54, 0x84, 0x54, 0xde, 0x54, 0x15, 0xd2, 0xb6, 0x78, 0xf2, 0xbe, 0x25, 0x75, 0xde, 0x9d, 0x61, 0x48, 0xe5, 0x0d, 0x21, 0x48, 0x5a, 0x8e, 0x23,
0xeb, 0xf2, 0x7a, 0xc8, 0x7f, 0xb6, 0x60, 0xb1, 0x0b, 0xa3, 0xb1, 0xd8, 0xb3, 0x22, 0x58, 0x62, 0xea, 0x21, 0xfb, 0xd9, 0x8c, 0xc9, 0x2f, 0x9c, 0xc6, 0x63, 0xcf, 0x8b, 0x60, 0x9e, 0xd3, 0x7c,
0xb4, 0x00, 0x3b, 0xdb, 0xf7, 0x01, 0x02, 0xec, 0xd4, 0xfd, 0xb0, 0x6e, 0xbb, 0xae, 0xfe, 0x87, 0x62, 0xef, 0xcc, 0x01, 0xf8, 0xc4, 0xae, 0x7a, 0x41, 0xd5, 0x72, 0x1c, 0xed, 0x0f, 0x05, 0xd0,
0x02, 0xea, 0xee, 0x05, 0x6a, 0xdc, 0x41, 0xa2, 0xa3, 0x09, 0x94, 0x1a, 0x3d, 0x81, 0xd2, 0x63, 0xde, 0x25, 0xae, 0x3d, 0x40, 0xa2, 0xa3, 0xf1, 0x93, 0xb8, 0x7b, 0xfc, 0x24, 0x07, 0x8c, 0x9f,
0x26, 0x50, 0x66, 0xec, 0x04, 0xca, 0x0e, 0x4c, 0xa0, 0x0a, 0x64, 0x48, 0x80, 0x1a, 0x7c, 0x66, 0xd4, 0xc0, 0xf1, 0x93, 0xee, 0x19, 0x3f, 0x25, 0x48, 0x51, 0x1f, 0xd7, 0xc4, 0xc0, 0xca, 0x95,
0x15, 0xaa, 0xab, 0x43, 0x45, 0xbd, 0xe5, 0x75, 0x2d, 0xce, 0xa1, 0xbf, 0x07, 0xff, 0xeb, 0xf3, 0x97, 0xfb, 0x8a, 0x7a, 0xdb, 0x6d, 0x9b, 0x82, 0x43, 0x7b, 0x17, 0xfe, 0xd7, 0xe5, 0x95, 0x4c,
0x4a, 0x26, 0x4c, 0xd6, 0xa2, 0x72, 0x53, 0x8b, 0x3f, 0x2a, 0xb0, 0x6c, 0x21, 0x82, 0xbf, 0x47, 0x98, 0xac, 0x45, 0xe5, 0xb6, 0x16, 0x7f, 0x54, 0x60, 0xd1, 0xc4, 0x94, 0x7c, 0x8f, 0x8f, 0x58,
0x87, 0xb4, 0x7b, 0xa7, 0x65, 0xce, 0xe2, 0xf1, 0x16, 0x3b, 0xf4, 0x4c, 0xb6, 0xa8, 0xb8, 0x30, 0xfb, 0x41, 0xcb, 0x9c, 0xc7, 0xe3, 0x0d, 0xb1, 0xd9, 0xb9, 0x6c, 0xd1, 0xf0, 0xc2, 0xfd, 0x3e,
0xbf, 0xcf, 0x10, 0x6e, 0x9e, 0x89, 0xd6, 0x5c, 0xb2, 0xe4, 0x4d, 0x77, 0xe1, 0xc1, 0x8e, 0xeb, 0xc7, 0xa4, 0x7e, 0x1e, 0xb6, 0xe6, 0xbc, 0x29, 0x6f, 0x9a, 0x03, 0x0b, 0xbb, 0x8e, 0x47, 0xf1,
0x13, 0xb4, 0x7f, 0x70, 0xe7, 0x56, 0x88, 0xac, 0xf0, 0xc2, 0x90, 0x59, 0x61, 0xe3, 0xf2, 0xd0, 0xc1, 0xe1, 0x83, 0x5b, 0x11, 0x66, 0x45, 0x14, 0x86, 0xcc, 0x0a, 0x1f, 0x97, 0x47, 0x56, 0x8b,
0xee, 0x10, 0x74, 0x07, 0xe3, 0xd2, 0x42, 0xa4, 0xd3, 0x9e, 0x5b, 0xd1, 0xe7, 0xb0, 0xca, 0xfa, 0xe2, 0x07, 0x18, 0x97, 0x26, 0xa6, 0xad, 0xe6, 0xd4, 0x8a, 0x3e, 0x87, 0x65, 0xde, 0x5f, 0x32,
0x4b, 0x26, 0x0c, 0xcd, 0x53, 0x88, 0xfa, 0x11, 0x3c, 0x1a, 0xd0, 0x25, 0xd3, 0xbf, 0x09, 0x8b, 0x61, 0x78, 0x9a, 0x42, 0xd4, 0x8e, 0xe1, 0x49, 0x8f, 0x2e, 0x99, 0xfe, 0x2d, 0x98, 0xf5, 0x3b,
0x41, 0x8f, 0x28, 0x7b, 0xf6, 0xc9, 0xc8, 0x9e, 0xed, 0xd5, 0xcd, 0x0d, 0xbb, 0xfe, 0x5b, 0x0a, 0x44, 0xd9, 0xb3, 0xab, 0x77, 0xf6, 0x6c, 0xa7, 0x6e, 0x6e, 0xd9, 0xb5, 0xdf, 0x12, 0xf0, 0x64,
0x1e, 0xed, 0x44, 0x58, 0x36, 0xa7, 0xbb, 0x6a, 0x1d, 0x56, 0x02, 0x3b, 0x44, 0x1e, 0xad, 0xc7, 0x37, 0xc2, 0xb2, 0x29, 0xdd, 0x45, 0x55, 0x58, 0xf2, 0xad, 0x00, 0xbb, 0xac, 0x1a, 0xc3, 0xd3,
0x20, 0x55, 0x20, 0x5f, 0x95, 0xcd, 0xe3, 0xbf, 0xae, 0xca, 0x4f, 0x63, 0xbb, 0x8a, 0x1f, 0x20, 0x10, 0xf9, 0xca, 0x7c, 0x1e, 0xff, 0x75, 0x5d, 0x7c, 0x16, 0xdb, 0x52, 0x3c, 0x1f, 0xbb, 0x91,
0x2f, 0x12, 0x27, 0x66, 0xd3, 0x7f, 0xe6, 0xe0, 0x26, 0x22, 0xd4, 0xa8, 0xf1, 0x3f, 0xd6, 0xb2, 0x38, 0x35, 0xea, 0xde, 0xba, 0x4d, 0xea, 0x98, 0x32, 0xbd, 0x22, 0xfe, 0x99, 0x8b, 0xa1, 0xb2,
0x50, 0x76, 0x63, 0x9f, 0x7a, 0x0c, 0xf7, 0xfc, 0x80, 0x62, 0xdf, 0xeb, 0xed, 0x10, 0x2f, 0x8d, 0x5b, 0xfb, 0xd0, 0x09, 0x3c, 0xf2, 0x7c, 0x46, 0x3c, 0xb7, 0xb3, 0x3d, 0xbc, 0xd4, 0x87, 0xad,
0x49, 0xdb, 0x9e, 0x31, 0xd2, 0x35, 0xe3, 0x40, 0xa8, 0xd8, 0xf5, 0x68, 0xd8, 0xb5, 0x7a, 0x0a, 0x75, 0xfa, 0x9d, 0xae, 0xe9, 0x87, 0xa1, 0x8a, 0x3d, 0x97, 0x05, 0x6d, 0xb3, 0xa3, 0x50, 0xdd,
0xb5, 0x4d, 0xb8, 0x1f, 0xff, 0xc0, 0x8a, 0xae, 0x85, 0xba, 0x72, 0x60, 0xb2, 0x23, 0x2b, 0xba, 0x82, 0xb9, 0xf8, 0x07, 0x5e, 0x74, 0x0d, 0xdc, 0x96, 0x03, 0x93, 0x1f, 0x79, 0xd1, 0x5d, 0x58,
0x73, 0xdb, 0xed, 0xa0, 0xde, 0x28, 0xe0, 0x97, 0xcd, 0xd4, 0xc7, 0x8a, 0xfe, 0x2d, 0xac, 0x0d, 0x4e, 0x0b, 0x77, 0x46, 0x81, 0xb8, 0x6c, 0x25, 0x3e, 0x56, 0xb4, 0x6f, 0x61, 0xa5, 0xf7, 0x29,
0x3e, 0x25, 0x93, 0xb3, 0x05, 0x85, 0x9b, 0x7d, 0xad, 0x97, 0x9e, 0xc4, 0xfd, 0x22, 0x2e, 0x53, 0x99, 0x9c, 0x4f, 0x20, 0x77, 0xbb, 0xa9, 0xdd, 0x99, 0x9e, 0xbe, 0xe5, 0x22, 0x2e, 0x50, 0xfe,
0xfd, 0x17, 0x20, 0xcb, 0x27, 0xb4, 0xda, 0x82, 0x9c, 0x58, 0x35, 0x54, 0x33, 0xc1, 0xef, 0xc1, 0x17, 0x20, 0x2d, 0xc6, 0x33, 0x6a, 0x40, 0x26, 0xdc, 0x33, 0x90, 0x31, 0xc2, 0xe9, 0xde, 0x3d,
0x85, 0x4d, 0xfb, 0x70, 0x7a, 0x01, 0x69, 0xf9, 0x01, 0x64, 0xf9, 0xee, 0xa1, 0x1a, 0x93, 0x45, 0x4d, 0xfd, 0x60, 0x7c, 0x01, 0x69, 0xf6, 0x21, 0xa4, 0xc5, 0xe2, 0x81, 0xf4, 0xe1, 0xa2, 0xbd,
0x07, 0x17, 0x14, 0x6d, 0x6d, 0x68, 0x82, 0xed, 0xb2, 0x1d, 0x5b, 0x6d, 0x42, 0x4e, 0xc0, 0x6f, 0xdb, 0x89, 0xba, 0xd2, 0x37, 0xbe, 0xf6, 0xf8, 0x26, 0x8d, 0xea, 0x90, 0x09, 0xb1, 0x77, 0x94,
0x92, 0xf5, 0x43, 0xab, 0x8a, 0xf6, 0xc1, 0x34, 0x02, 0x91, 0xe5, 0x6f, 0x60, 0xa9, 0x0f, 0xe7, 0xf5, 0x7d, 0x7b, 0x8a, 0xfa, 0xfe, 0x38, 0x02, 0x91, 0xe5, 0xaf, 0x61, 0xbe, 0x0b, 0xe4, 0x51,
0xd5, 0xea, 0x34, 0xe2, 0xfd, 0x58, 0x31, 0xe3, 0x93, 0x27, 0x90, 0xde, 0x43, 0x54, 0x4d, 0x10, 0x79, 0x1c, 0xf1, 0x6e, 0xa0, 0x98, 0xf0, 0xc9, 0x53, 0x48, 0xee, 0x63, 0x86, 0x46, 0x08, 0x75,
0xea, 0xdf, 0x0f, 0xb4, 0x67, 0x53, 0x72, 0xcb, 0x37, 0x9a, 0x90, 0x61, 0x03, 0x20, 0x29, 0x1f, 0x2f, 0x07, 0xea, 0xfa, 0x98, 0xdc, 0xf2, 0x8d, 0x3a, 0xa4, 0x78, 0xf7, 0x8f, 0xca, 0x47, 0x2f,
0x83, 0xe0, 0xaf, 0x99, 0x53, 0xf3, 0xcb, 0x87, 0xf6, 0x21, 0xc3, 0xe0, 0x5c, 0x7d, 0x7f, 0xb2, 0xf2, 0xab, 0xc6, 0xd8, 0xfc, 0xf2, 0xa1, 0x03, 0x48, 0x71, 0x2c, 0x47, 0xef, 0x0d, 0x17, 0x8c,
0x60, 0x0c, 0xf2, 0xc7, 0xe6, 0xbc, 0x05, 0x19, 0x86, 0x58, 0x6a, 0x42, 0xf9, 0x0d, 0x63, 0xb5, 0xe1, 0xfd, 0xc0, 0x9c, 0x37, 0x20, 0xc5, 0xe1, 0x0a, 0x8d, 0x28, 0xbf, 0x7e, 0xa0, 0x56, 0x37,
0xb6, 0x31, 0x83, 0x84, 0xb4, 0xfb, 0x08, 0x16, 0x23, 0xd0, 0x4b, 0x8a, 0xd2, 0x20, 0x3a, 0x8e, 0x26, 0x90, 0x90, 0x76, 0x1f, 0xc3, 0x6c, 0x84, 0x78, 0xa3, 0xa2, 0xd4, 0x0b, 0x8d, 0x03, 0x3d,
0xf5, 0xe0, 0x00, 0xee, 0x49, 0x04, 0x4b, 0xca, 0x6e, 0x3f, 0xd0, 0x4d, 0x50, 0x98, 0xe5, 0x20, 0x38, 0x84, 0x47, 0x12, 0xbe, 0x46, 0x65, 0xb7, 0x1b, 0xe5, 0x86, 0x28, 0x4c, 0x0b, 0x84, 0x1a,
0x95, 0x64, 0xe1, 0x20, 0x92, 0x8d, 0x55, 0xf8, 0x35, 0xe4, 0x04, 0x5a, 0x25, 0xf5, 0xd5, 0x10, 0x65, 0x61, 0x2f, 0x8c, 0x0d, 0x54, 0xf8, 0x35, 0x64, 0x42, 0xa8, 0x1a, 0xd5, 0x57, 0x7d, 0x80,
0xa6, 0x8d, 0x55, 0x79, 0x01, 0x4b, 0x7d, 0x58, 0x93, 0xd4, 0x41, 0xa3, 0x40, 0x4e, 0x7b, 0x3e, 0x36, 0x50, 0xe5, 0x25, 0xcc, 0x77, 0x01, 0xcd, 0xa8, 0x0e, 0xba, 0x0b, 0xe1, 0xd4, 0xcd, 0x89,
0x93, 0x8c, 0xcc, 0xe1, 0x5b, 0x80, 0xd8, 0xbc, 0x7f, 0x7e, 0x8b, 0xf1, 0xae, 0x7d, 0x34, 0x9b, 0x64, 0x64, 0x0e, 0xdf, 0x00, 0xc4, 0x86, 0xfd, 0xe6, 0x3d, 0x66, 0xbb, 0xfa, 0xe1, 0x64, 0x42,
0x90, 0x78, 0x78, 0xfb, 0x9b, 0xcb, 0x77, 0xa5, 0x85, 0x3f, 0xdf, 0x95, 0x16, 0x7e, 0xb8, 0x2e, 0xe1, 0xc3, 0x3b, 0xdf, 0x5c, 0xbd, 0x2d, 0xcc, 0xfc, 0xf9, 0xb6, 0x30, 0xf3, 0xc3, 0x4d, 0x41,
0x29, 0x97, 0xd7, 0x25, 0xe5, 0xf7, 0xeb, 0x92, 0xf2, 0xcf, 0x75, 0x49, 0x39, 0x7e, 0x71, 0xbb, 0xb9, 0xba, 0x29, 0x28, 0xbf, 0xdf, 0x14, 0x94, 0x7f, 0x6e, 0x0a, 0xca, 0xc9, 0x8b, 0xfb, 0xfd,
0x7f, 0x4a, 0x7c, 0xc2, 0x0f, 0x27, 0x39, 0x1e, 0xda, 0xe7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xf0, 0x5c, 0x1c, 0x4e, 0x33, 0x22, 0xb4, 0x9b, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf2,
0x21, 0x4a, 0x1d, 0x66, 0xdb, 0x10, 0x00, 0x00, 0x10, 0x7d, 0xd7, 0xc1, 0x10, 0x00, 0x00,
} }

10
api/services/tasks/v1/tasks.proto
View File

@ -5,8 +5,8 @@ package containerd.services.tasks.v1;
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/api/types/mount/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";
import "github.com/containerd/containerd/api/types/task/task.proto"; import "github.com/containerd/containerd/api/types/task/task.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
@ -62,14 +62,14 @@ message CreateTaskRequest {
// These are for mounts that cannot be performed in the user namespace. // These are for mounts that cannot be performed in the user namespace.
// Typically, these mounts should be resolved from snapshots specified on // Typically, these mounts should be resolved from snapshots specified on
// the container object. // the container object.
repeated containerd.v1.types.Mount rootfs = 3; repeated containerd.types.Mount rootfs = 3;
string stdin = 4; string stdin = 4;
string stdout = 5; string stdout = 5;
string stderr = 6; string stderr = 6;
bool terminal = 7; bool terminal = 7;
containerd.v1.types.Descriptor checkpoint = 8; containerd.types.Descriptor checkpoint = 8;
} }
message CreateTaskResponse { message CreateTaskResponse {
@ -186,5 +186,5 @@ message CheckpointTaskRequest {
} }
message CheckpointTaskResponse { message CheckpointTaskResponse {
repeated containerd.v1.types.Descriptor descriptors = 1; repeated containerd.types.Descriptor descriptors = 1;
} }

42
api/types/descriptor/descriptor.pb.go → api/types/descriptor.pb.go
View File

@ -1,17 +1,19 @@
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: github.com/containerd/containerd/api/types/descriptor/descriptor.proto // source: github.com/containerd/containerd/api/types/descriptor.proto
// DO NOT EDIT! // DO NOT EDIT!
/* /*
Package descriptor is a generated protocol buffer package. Package types is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
github.com/containerd/containerd/api/types/descriptor/descriptor.proto github.com/containerd/containerd/api/types/descriptor.proto
github.com/containerd/containerd/api/types/mount.proto
It has these top-level messages: It has these top-level messages:
Descriptor Descriptor
Mount
*/ */
package descriptor package types
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
@ -52,7 +54,7 @@ func (*Descriptor) ProtoMessage() {}
func (*Descriptor) Descriptor() ([]byte, []int) { return fileDescriptorDescriptor, []int{0} } func (*Descriptor) Descriptor() ([]byte, []int) { return fileDescriptorDescriptor, []int{0} }
func init() { func init() {
proto.RegisterType((*Descriptor)(nil), "containerd.v1.types.Descriptor") proto.RegisterType((*Descriptor)(nil), "containerd.types.Descriptor")
} }
func (m *Descriptor) Marshal() (dAtA []byte, err error) { func (m *Descriptor) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
@ -399,24 +401,24 @@ var (
) )
func init() { func init() {
proto.RegisterFile("github.com/containerd/containerd/api/types/descriptor/descriptor.proto", fileDescriptorDescriptor) proto.RegisterFile("github.com/containerd/containerd/api/types/descriptor.proto", fileDescriptorDescriptor)
} }
var fileDescriptorDescriptor = []byte{ var fileDescriptorDescriptor = []byte{
// 229 bytes of a gzipped FileDescriptorProto // 232 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4b, 0xcf, 0x2c, 0xc9, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xa7, 0xa4, 0x16, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xa7, 0xa4, 0x16,
0x27, 0x17, 0x65, 0x16, 0x94, 0xe4, 0x17, 0x21, 0x31, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x27, 0x17, 0x65, 0x16, 0x94, 0xe4, 0x17, 0xe9, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x20,
0x84, 0x11, 0x3a, 0xf4, 0xca, 0x0c, 0xf5, 0xc0, 0x1a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x94, 0xe9, 0x81, 0x95, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf5, 0x41, 0x2c, 0x88,
0xf2, 0xfa, 0x20, 0x16, 0x44, 0xa9, 0x52, 0x37, 0x23, 0x17, 0x97, 0x0b, 0x5c, 0xbf, 0x90, 0x2c, 0x3a, 0xa5, 0x6e, 0x46, 0x2e, 0x2e, 0x17, 0xb8, 0x66, 0x21, 0x59, 0x2e, 0xae, 0xdc, 0xd4, 0x94,
0x17, 0x57, 0x6e, 0x6a, 0x4a, 0x66, 0x62, 0x3c, 0x48, 0x8f, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0xcc, 0xc4, 0x78, 0x90, 0x1e, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x4e, 0xb0, 0x48, 0x48,
0x10, 0x27, 0x58, 0x24, 0xa4, 0xb2, 0x20, 0x55, 0xc8, 0x8b, 0x8b, 0x2d, 0x25, 0x33, 0x3d, 0xb5, 0x65, 0x41, 0xaa, 0x90, 0x17, 0x17, 0x5b, 0x4a, 0x66, 0x7a, 0x6a, 0x71, 0x89, 0x04, 0x13, 0x48,
0xb8, 0x44, 0x82, 0x09, 0x24, 0xe5, 0x64, 0x74, 0xe2, 0x9e, 0x3c, 0xc3, 0xad, 0x7b, 0xf2, 0x5a, 0xca, 0xc9, 0xe8, 0xc4, 0x3d, 0x79, 0x86, 0x5b, 0xf7, 0xe4, 0xb5, 0x90, 0x9c, 0x9a, 0x5f, 0x90,
0x48, 0x0e, 0xcf, 0x2f, 0x48, 0xcd, 0x83, 0xdb, 0x5f, 0xac, 0x9f, 0x9e, 0xaf, 0x0b, 0xd1, 0xa2, 0x9a, 0x07, 0xb7, 0xbc, 0x58, 0x3f, 0x3d, 0x5f, 0x17, 0xa2, 0x45, 0xcf, 0x05, 0x4c, 0x05, 0x41,
0xe7, 0x02, 0xa6, 0x82, 0xa0, 0x26, 0x08, 0x09, 0x71, 0xb1, 0x14, 0x67, 0x56, 0xa5, 0x4a, 0x30, 0x4d, 0x10, 0x12, 0xe2, 0x62, 0x29, 0xce, 0xac, 0x4a, 0x95, 0x60, 0x56, 0x60, 0xd4, 0x60, 0x0e,
0x2b, 0x30, 0x6a, 0x30, 0x07, 0x81, 0xd9, 0x4e, 0x12, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0x02, 0xb3, 0x9d, 0xbc, 0x4e, 0x3c, 0x94, 0x63, 0xb8, 0xf1, 0x50, 0x8e, 0xa1, 0xe1, 0x91, 0x1c,
0xc7, 0xd0, 0xf0, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x18, 0x65, 0x40,
0x92, 0x63, 0x4c, 0x62, 0x03, 0x3b, 0xd7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x45, 0x60, 0xfd, 0x7c, 0x60, 0x58, 0x83, 0xc9, 0x24, 0x36, 0xb0, 0x07, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
0x5b, 0x23, 0x01, 0x00, 0x00, 0x23, 0x14, 0xc9, 0x7c, 0x47, 0x01, 0x00, 0x00,
} }

4
api/types/descriptor/descriptor.proto → api/types/descriptor.proto
View File

@ -1,9 +1,11 @@
syntax = "proto3"; syntax = "proto3";
package containerd.v1.types; package containerd.types;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/types;types";
// Descriptor describes a blob in a content store. // Descriptor describes a blob in a content store.
// //
// This descriptor can be used to reference content from an // This descriptor can be used to reference content from an

1
api/types/doc.go Normal file
View File

@ -0,0 +1 @@
package types

47
api/types/mount/mount.pb.go → api/types/mount.pb.go
View File

@ -1,17 +1,8 @@
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: github.com/containerd/containerd/api/types/mount/mount.proto // source: github.com/containerd/containerd/api/types/mount.proto
// DO NOT EDIT! // DO NOT EDIT!
/* package types
Package mount is a generated protocol buffer package.
It is generated from these files:
github.com/containerd/containerd/api/types/mount/mount.proto
It has these top-level messages:
Mount
*/
package mount
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
@ -28,12 +19,6 @@ var _ = proto.Marshal
var _ = fmt.Errorf var _ = fmt.Errorf
var _ = math.Inf var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
// Mount describes mounts for a container. // Mount describes mounts for a container.
// //
// This type is the lingua franca of ContainerD. All services provide mounts // This type is the lingua franca of ContainerD. All services provide mounts
@ -58,7 +43,7 @@ func (*Mount) ProtoMessage() {}
func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorMount, []int{0} } func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorMount, []int{0} }
func init() { func init() {
proto.RegisterType((*Mount)(nil), "containerd.v1.types.Mount") proto.RegisterType((*Mount)(nil), "containerd.types.Mount")
} }
func (m *Mount) Marshal() (dAtA []byte, err error) { func (m *Mount) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
@ -468,22 +453,22 @@ var (
) )
func init() { func init() {
proto.RegisterFile("github.com/containerd/containerd/api/types/mount/mount.proto", fileDescriptorMount) proto.RegisterFile("github.com/containerd/containerd/api/types/mount.proto", fileDescriptorMount)
} }
var fileDescriptorMount = []byte{ var fileDescriptorMount = []byte{
// 197 bytes of a gzipped FileDescriptorProto // 200 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4b, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xe6, 0x97, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xe6, 0x97,
0xe6, 0x95, 0x40, 0x48, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x61, 0x84, 0x3a, 0xbd, 0x32, 0xe6, 0x95, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x20, 0x54, 0xe8, 0x81, 0x65, 0xa5,
0x43, 0x3d, 0xb0, 0x32, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x92, 0xfa, 0x20, 0x16, 0x44, 0x9d, 0x52, 0x2a, 0x17, 0xab,
0xaa, 0x94, 0xca, 0xc5, 0xea, 0x0b, 0xd2, 0x29, 0x24, 0xc4, 0xc5, 0x02, 0x52, 0x27, 0xc1, 0xa8, 0x2f, 0x48, 0x9b, 0x90, 0x10, 0x17, 0x0b, 0x48, 0x9d, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10,
0xc0, 0xa8, 0xc1, 0x19, 0x04, 0x66, 0x0b, 0x89, 0x71, 0xb1, 0x15, 0xe7, 0x97, 0x16, 0x25, 0xa7, 0x98, 0x2d, 0x24, 0xc6, 0xc5, 0x56, 0x9c, 0x5f, 0x5a, 0x94, 0x9c, 0x2a, 0xc1, 0x04, 0x16, 0x85,
0x4a, 0x30, 0x81, 0x45, 0xa1, 0x3c, 0x90, 0x78, 0x49, 0x62, 0x51, 0x7a, 0x6a, 0x89, 0x04, 0x33, 0xf2, 0x40, 0xe2, 0x25, 0x89, 0x45, 0xe9, 0xa9, 0x25, 0x12, 0xcc, 0x10, 0x71, 0x08, 0x4f, 0x48,
0x44, 0x1c, 0xc2, 0x13, 0x92, 0xe0, 0x62, 0xcf, 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x96, 0x60, 0x82, 0x8b, 0x3d, 0xbf, 0xa0, 0x24, 0x33, 0x3f, 0xaf, 0x58, 0x82, 0x45, 0x81, 0x59, 0x83, 0x33,
0x51, 0x60, 0xd6, 0xe0, 0x0c, 0x82, 0x71, 0x9d, 0x24, 0x4e, 0x3c, 0x94, 0x63, 0xb8, 0xf1, 0x50, 0x08, 0xc6, 0x75, 0xf2, 0x3a, 0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72,
0x8e, 0xa1, 0xe1, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x01,
0x24, 0xc7, 0x98, 0xc4, 0x06, 0x76, 0x87, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xda, 0x1c, 0xf1, 0x1e, 0xb4, 0x06, 0x93, 0x49, 0x6c, 0x60, 0x97, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
0x59, 0xf2, 0x00, 0x00, 0x00, 0xe5, 0xc7, 0x07, 0x3f, 0x1b, 0x01, 0x00, 0x00,
} }

4
api/types/mount/mount.proto → api/types/mount.proto
View File

@ -1,9 +1,11 @@
syntax = "proto3"; syntax = "proto3";
package containerd.v1.types; package containerd.types;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/types;types";
// Mount describes mounts for a container. // Mount describes mounts for a container.
// //
// This type is the lingua franca of ContainerD. All services provide mounts // This type is the lingua franca of ContainerD. All services provide mounts

4
container.go
View File

@ -11,7 +11,7 @@ import (
"github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -128,7 +128,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne
return nil, err return nil, err
} }
for _, m := range mounts { for _, m := range mounts {
request.Rootfs = append(request.Rootfs, &mount.Mount{ request.Rootfs = append(request.Rootfs, &types.Mount{
Type: m.Type, Type: m.Type,
Source: m.Source, Source: m.Source,
Options: m.Options, Options: m.Options,

4
container_unix.go
View File

@ -10,7 +10,7 @@ import (
"github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/snapshot" "github.com/containerd/containerd/snapshot"
@ -91,7 +91,7 @@ func WithTaskCheckpoint(desc v1.Descriptor) NewTaskOpts {
} }
for _, m := range index.Manifests { for _, m := range index.Manifests {
if m.MediaType == images.MediaTypeContainerd1Checkpoint { if m.MediaType == images.MediaTypeContainerd1Checkpoint {
r.Checkpoint = &descriptor.Descriptor{ r.Checkpoint = &types.Descriptor{
MediaType: m.MediaType, MediaType: m.MediaType,
Size_: m.Size, Size_: m.Size,
Digest: m.Digest, Digest: m.Digest,

4
linux/runtime.go
View File

@ -18,7 +18,7 @@ import (
eventsapi "github.com/containerd/containerd/api/services/events/v1" eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
shimb "github.com/containerd/containerd/linux/shim" shimb "github.com/containerd/containerd/linux/shim"
@ -223,7 +223,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
Checkpoint: opts.Checkpoint, Checkpoint: opts.Checkpoint,
} }
for _, m := range opts.Rootfs { for _, m := range opts.Rootfs {
sopts.Rootfs = append(sopts.Rootfs, &mount.Mount{ sopts.Rootfs = append(sopts.Rootfs, &types.Mount{
Type: m.Type, Type: m.Type,
Source: m.Source, Source: m.Source,
Options: m.Options, Options: m.Options,

15
services/diff/client.go
View File

@ -2,8 +2,7 @@ package diff
import ( import (
diffapi "github.com/containerd/containerd/api/services/diff/v1" diffapi "github.com/containerd/containerd/api/services/diff/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types"
mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -53,7 +52,7 @@ func (r *remote) DiffMounts(ctx context.Context, a, b []mount.Mount, media, ref
return toDescriptor(resp.Diff), nil return toDescriptor(resp.Diff), nil
} }
func toDescriptor(d *descriptor.Descriptor) ocispec.Descriptor { func toDescriptor(d *types.Descriptor) ocispec.Descriptor {
return ocispec.Descriptor{ return ocispec.Descriptor{
MediaType: d.MediaType, MediaType: d.MediaType,
Digest: d.Digest, Digest: d.Digest,
@ -61,18 +60,18 @@ func toDescriptor(d *descriptor.Descriptor) ocispec.Descriptor {
} }
} }
func fromDescriptor(d ocispec.Descriptor) *descriptor.Descriptor { func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {
return &descriptor.Descriptor{ return &types.Descriptor{
MediaType: d.MediaType, MediaType: d.MediaType,
Digest: d.Digest, Digest: d.Digest,
Size_: d.Size, Size_: d.Size,
} }
} }
func fromMounts(mounts []mount.Mount) []*mounttypes.Mount { func fromMounts(mounts []mount.Mount) []*types.Mount {
apiMounts := make([]*mounttypes.Mount, len(mounts)) apiMounts := make([]*types.Mount, len(mounts))
for i, m := range mounts { for i, m := range mounts {
apiMounts[i] = &mounttypes.Mount{ apiMounts[i] = &types.Mount{
Type: m.Type, Type: m.Type,
Source: m.Source, Source: m.Source,
Options: m.Options, Options: m.Options,

4
services/diff/service.go
View File

@ -2,7 +2,7 @@ package diff
import ( import (
diffapi "github.com/containerd/containerd/api/services/diff/v1" diffapi "github.com/containerd/containerd/api/services/diff/v1"
mounttypes "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -68,7 +68,7 @@ func (s *service) Diff(ctx context.Context, dr *diffapi.DiffRequest) (*diffapi.D
}, nil }, nil
} }
func toMounts(apim []*mounttypes.Mount) []mount.Mount { func toMounts(apim []*types.Mount) []mount.Mount {
mounts := make([]mount.Mount, len(apim)) mounts := make([]mount.Mount, len(apim))
for i, m := range apim { for i, m := range apim {
mounts[i] = mount.Mount{ mounts[i] = mount.Mount{

8
services/images/helpers.go
View File

@ -2,7 +2,7 @@ package images
import ( import (
imagesapi "github.com/containerd/containerd/api/services/images/v1" imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/metadata" "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
@ -46,7 +46,7 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {
} }
} }
func descFromProto(desc *descriptor.Descriptor) ocispec.Descriptor { func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
return ocispec.Descriptor{ return ocispec.Descriptor{
MediaType: desc.MediaType, MediaType: desc.MediaType,
Size: desc.Size_, Size: desc.Size_,
@ -54,8 +54,8 @@ func descFromProto(desc *descriptor.Descriptor) ocispec.Descriptor {
} }
} }
func descToProto(desc *ocispec.Descriptor) descriptor.Descriptor { func descToProto(desc *ocispec.Descriptor) types.Descriptor {
return descriptor.Descriptor{ return types.Descriptor{
MediaType: desc.MediaType, MediaType: desc.MediaType,
Size_: desc.Size, Size_: desc.Size,
Digest: desc.Digest, Digest: desc.Digest,

4
services/snapshot/client.go
View File

@ -9,7 +9,7 @@ import (
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
mountapi "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshot" "github.com/containerd/containerd/snapshot"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -146,7 +146,7 @@ func toUsage(resp *snapshotapi.UsageResponse) snapshot.Usage {
} }
} }
func toMounts(mm []*mountapi.Mount) []mount.Mount { func toMounts(mm []*types.Mount) []mount.Mount {
mounts := make([]mount.Mount, len(mm)) mounts := make([]mount.Mount, len(mm))
for i, m := range mm { for i, m := range mm {
mounts[i] = mount.Mount{ mounts[i] = mount.Mount{

8
services/snapshot/service.go
View File

@ -5,7 +5,7 @@ import (
eventsapi "github.com/containerd/containerd/api/services/events/v1" eventsapi "github.com/containerd/containerd/api/services/events/v1"
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
mounttypes "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
@ -227,10 +227,10 @@ func fromUsage(usage snapshot.Usage) *snapshotapi.UsageResponse {
} }
} }
func fromMounts(mounts []mount.Mount) []*mounttypes.Mount { func fromMounts(mounts []mount.Mount) []*types.Mount {
out := make([]*mounttypes.Mount, len(mounts)) out := make([]*types.Mount, len(mounts))
for i, m := range mounts { for i, m := range mounts {
out[i] = &mounttypes.Mount{ out[i] = &types.Mount{
Type: m.Type, Type: m.Type,
Source: m.Source, Source: m.Source,
Options: m.Options, Options: m.Options,

8
services/tasks/service.go
View File

@ -11,7 +11,7 @@ import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1" eventsapi "github.com/containerd/containerd/api/services/events/v1"
api "github.com/containerd/containerd/api/services/tasks/v1" api "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/archive" "github.com/containerd/containerd/archive"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
@ -444,14 +444,14 @@ func (s *Service) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest)
return nil, err return nil, err
} }
return &api.CheckpointTaskResponse{ return &api.CheckpointTaskResponse{
Descriptors: []*descriptor.Descriptor{ Descriptors: []*types.Descriptor{
cp, cp,
specD, specD,
}, },
}, nil }, nil
} }
func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.Reader) (*descriptor.Descriptor, error) { func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.Reader) (*types.Descriptor, error) {
writer, err := s.store.Writer(ctx, ref, 0, "") writer, err := s.store.Writer(ctx, ref, 0, "")
if err != nil { if err != nil {
return nil, err return nil, err
@ -464,7 +464,7 @@ func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.
if err := writer.Commit(0, ""); err != nil { if err := writer.Commit(0, ""); err != nil {
return nil, err return nil, err
} }
return &descriptor.Descriptor{ return &types.Descriptor{
MediaType: mediaType, MediaType: mediaType,
Digest: writer.Digest(), Digest: writer.Digest(),
Size_: size, Size_: size,