github/containerd
4
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
26 changed files with 496 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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