Add labels for containers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
parent
76d69b4ed8
commit
d6bd304c92
8 changed files with 134 additions and 109 deletions
api/grpc
ctr
runtime
supervisor
|
|
@ -37,6 +37,7 @@ func (s *apiServer) CreateContainer(ctx context.Context, c *types.CreateContaine
|
||||||
e.Stdin = c.Stdin
|
e.Stdin = c.Stdin
|
||||||
e.Stdout = c.Stdout
|
e.Stdout = c.Stdout
|
||||||
e.Stderr = c.Stderr
|
e.Stderr = c.Stderr
|
||||||
|
e.Labels = c.Labels
|
||||||
e.StartResponse = make(chan supervisor.StartResponse, 1)
|
e.StartResponse = make(chan supervisor.StartResponse, 1)
|
||||||
if c.Checkpoint != "" {
|
if c.Checkpoint != "" {
|
||||||
e.Checkpoint = &runtime.Checkpoint{
|
e.Checkpoint = &runtime.Checkpoint{
|
||||||
|
|
@ -224,6 +225,7 @@ func createAPIContainer(c runtime.Container) (*types.Container, error) {
|
||||||
Id: c.ID(),
|
Id: c.ID(),
|
||||||
BundlePath: c.Path(),
|
BundlePath: c.Path(),
|
||||||
Processes: procs,
|
Processes: procs,
|
||||||
|
Labels: c.Labels(),
|
||||||
Status: string(c.State()),
|
Status: string(c.State()),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -86,12 +86,13 @@ func (*UpdateProcessResponse) ProtoMessage() {}
|
||||||
func (*UpdateProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
|
func (*UpdateProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
|
||||||
|
|
||||||
type CreateContainerRequest struct {
|
type CreateContainerRequest struct {
|
||||||
Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
||||||
BundlePath string `protobuf:"bytes,2,opt,name=bundlePath" json:"bundlePath,omitempty"`
|
BundlePath string `protobuf:"bytes,2,opt,name=bundlePath" json:"bundlePath,omitempty"`
|
||||||
Checkpoint string `protobuf:"bytes,3,opt,name=checkpoint" json:"checkpoint,omitempty"`
|
Checkpoint string `protobuf:"bytes,3,opt,name=checkpoint" json:"checkpoint,omitempty"`
|
||||||
Stdin string `protobuf:"bytes,4,opt,name=stdin" json:"stdin,omitempty"`
|
Stdin string `protobuf:"bytes,4,opt,name=stdin" json:"stdin,omitempty"`
|
||||||
Stdout string `protobuf:"bytes,5,opt,name=stdout" json:"stdout,omitempty"`
|
Stdout string `protobuf:"bytes,5,opt,name=stdout" json:"stdout,omitempty"`
|
||||||
Stderr string `protobuf:"bytes,6,opt,name=stderr" json:"stderr,omitempty"`
|
Stderr string `protobuf:"bytes,6,opt,name=stderr" json:"stderr,omitempty"`
|
||||||
|
Labels []string `protobuf:"bytes,7,rep,name=labels" json:"labels,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} }
|
func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} }
|
||||||
|
|
@ -308,6 +309,7 @@ type Container struct {
|
||||||
BundlePath string `protobuf:"bytes,3,opt,name=bundlePath" json:"bundlePath,omitempty"`
|
BundlePath string `protobuf:"bytes,3,opt,name=bundlePath" json:"bundlePath,omitempty"`
|
||||||
Processes []*Process `protobuf:"bytes,4,rep,name=processes" json:"processes,omitempty"`
|
Processes []*Process `protobuf:"bytes,4,rep,name=processes" json:"processes,omitempty"`
|
||||||
Status string `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
|
Status string `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
|
||||||
|
Labels []string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Container) Reset() { *m = Container{} }
|
func (m *Container) Reset() { *m = Container{} }
|
||||||
|
|
@ -1148,101 +1150,102 @@ var _API_serviceDesc = grpc.ServiceDesc{
|
||||||
}
|
}
|
||||||
|
|
||||||
var fileDescriptor0 = []byte{
|
var fileDescriptor0 = []byte{
|
||||||
// 1524 bytes of a gzipped FileDescriptorProto
|
// 1537 bytes of a gzipped FileDescriptorProto
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xdb, 0x6e, 0x1b, 0xc5,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xd9, 0x6e, 0xdc, 0x54,
|
||||||
0x1b, 0x8f, 0xed, 0xb5, 0x63, 0x7f, 0x3e, 0x24, 0xd9, 0x9c, 0x1c, 0xf7, 0xdf, 0x7f, 0xcb, 0xb6,
|
0x18, 0xce, 0x8c, 0x3d, 0xdb, 0x3f, 0x4b, 0x12, 0x67, 0x9b, 0x4c, 0x29, 0x0d, 0x6e, 0xa1, 0x15,
|
||||||
0xd0, 0x0a, 0x55, 0x51, 0x49, 0x39, 0x94, 0x22, 0x01, 0x25, 0xad, 0x5a, 0x50, 0x0b, 0x51, 0x93,
|
0xaa, 0xa2, 0x92, 0xb2, 0x94, 0x22, 0x01, 0x25, 0xad, 0x5a, 0x50, 0x0b, 0x51, 0x93, 0x20, 0x71,
|
||||||
0x20, 0x71, 0x83, 0xb5, 0xd9, 0x1d, 0xec, 0x21, 0x7b, 0x62, 0x77, 0x36, 0x89, 0xc5, 0x1b, 0x70,
|
0xc3, 0xc8, 0x63, 0x1f, 0x66, 0x0e, 0xf1, 0x86, 0x7d, 0x9c, 0x45, 0xe2, 0x09, 0xe0, 0x92, 0xe7,
|
||||||
0xcb, 0x73, 0x20, 0x71, 0xc5, 0x03, 0xf0, 0x04, 0x3c, 0x07, 0x4f, 0xc1, 0x37, 0x87, 0x1d, 0xef,
|
0x40, 0xe2, 0x8a, 0x07, 0xe0, 0x09, 0x78, 0x0e, 0x9e, 0x82, 0xff, 0x2c, 0xf6, 0xd8, 0x9e, 0xa5,
|
||||||
0xae, 0x0f, 0xa5, 0x17, 0xdc, 0x58, 0x9a, 0x99, 0xef, 0xf0, 0xfb, 0x7e, 0xdf, 0x61, 0x67, 0x0c,
|
0xf4, 0x82, 0x9b, 0x91, 0xce, 0x39, 0xff, 0xf2, 0xfd, 0xdf, 0xbf, 0xf8, 0x9c, 0x81, 0x96, 0x15,
|
||||||
0x2d, 0x3b, 0xa2, 0xfb, 0x51, 0x1c, 0xb2, 0xd0, 0xac, 0xb3, 0x49, 0x44, 0x12, 0xeb, 0x0c, 0xb6,
|
0xd2, 0xfd, 0x30, 0x0a, 0x58, 0x60, 0xd4, 0xd8, 0x55, 0x48, 0x62, 0x73, 0x04, 0x9b, 0xa7, 0xa1,
|
||||||
0x4e, 0x23, 0xd7, 0x66, 0xe4, 0x28, 0x0e, 0x1d, 0x92, 0x24, 0xaf, 0xc8, 0x4f, 0x29, 0x49, 0x98,
|
0x63, 0x31, 0x72, 0x14, 0x05, 0x36, 0x89, 0xe3, 0x97, 0xe4, 0xa7, 0x84, 0xc4, 0xcc, 0x00, 0xa8,
|
||||||
0x09, 0x50, 0xa5, 0x6e, 0xbf, 0x72, 0xb3, 0x72, 0xb7, 0x65, 0xb6, 0xa1, 0x16, 0xe1, 0xa2, 0x2a,
|
0x52, 0xa7, 0x5f, 0xd9, 0xab, 0xdc, 0x69, 0x19, 0x6d, 0xd0, 0x42, 0x5c, 0x54, 0xc5, 0x02, 0x4f,
|
||||||
0x16, 0x78, 0xe2, 0x78, 0x61, 0x42, 0x8e, 0x99, 0x4b, 0x83, 0x7e, 0x0d, 0xf7, 0x9a, 0x66, 0x17,
|
0x6c, 0x37, 0x88, 0xc9, 0x31, 0x73, 0xa8, 0xdf, 0xd7, 0x70, 0xaf, 0x69, 0x74, 0xa1, 0x76, 0x41,
|
||||||
0xea, 0x97, 0xd4, 0x65, 0xe3, 0xbe, 0x81, 0xcb, 0xae, 0xd9, 0x83, 0xc6, 0x98, 0xd0, 0xd1, 0x98,
|
0x1d, 0x36, 0xe9, 0xeb, 0xb8, 0xec, 0x1a, 0x3d, 0xa8, 0x4f, 0x08, 0x1d, 0x4f, 0x58, 0xbf, 0xc6,
|
||||||
0xf5, 0xeb, 0x7c, 0x6d, 0xed, 0xc2, 0x76, 0xc9, 0x47, 0x12, 0x85, 0x41, 0x42, 0xac, 0x9f, 0x61,
|
0xd7, 0xe6, 0x0e, 0x6c, 0x95, 0x7c, 0xc4, 0x61, 0xe0, 0xc7, 0xc4, 0xfc, 0xb5, 0x02, 0xdb, 0x87,
|
||||||
0xe7, 0x30, 0x26, 0x78, 0x70, 0x18, 0x06, 0xcc, 0xa6, 0x01, 0x89, 0xe7, 0xb9, 0xc7, 0xc5, 0x59,
|
0x11, 0xc1, 0x93, 0xc3, 0xc0, 0x67, 0x16, 0xf5, 0x49, 0x34, 0xcf, 0x3f, 0x2e, 0x46, 0x89, 0xef,
|
||||||
0x1a, 0xb8, 0x1e, 0x39, 0xb2, 0xd1, 0xc5, 0x14, 0xc5, 0x98, 0x38, 0xe7, 0x51, 0x48, 0x03, 0x26,
|
0xb8, 0xe4, 0xc8, 0x42, 0x1f, 0x53, 0x18, 0x13, 0x62, 0x9f, 0x85, 0x01, 0xf5, 0x99, 0x80, 0xd1,
|
||||||
0x50, 0xb4, 0x38, 0x8a, 0x44, 0x80, 0x32, 0xc4, 0x12, 0x51, 0xe0, 0x32, 0x4c, 0x25, 0x8a, 0x6c,
|
0xe2, 0x30, 0x62, 0x81, 0x4a, 0x17, 0x4b, 0x84, 0x81, 0xcb, 0x20, 0x91, 0x30, 0xd2, 0x35, 0x89,
|
||||||
0x4d, 0xe2, 0xb8, 0xdf, 0xe0, 0x6b, 0xeb, 0x53, 0xd8, 0x9d, 0x71, 0x2e, 0x71, 0x99, 0xb7, 0xa0,
|
0xa2, 0x7e, 0x3d, 0x5d, 0xbb, 0xd6, 0x88, 0xb8, 0x71, 0xbf, 0xb1, 0xa7, 0xdd, 0x69, 0x99, 0x9f,
|
||||||
0xe5, 0x64, 0x9b, 0x02, 0x44, 0xfb, 0x60, 0x7d, 0x5f, 0xf0, 0xb5, 0xaf, 0x85, 0xad, 0x87, 0xd0,
|
0xc2, 0xce, 0x0c, 0x18, 0x09, 0xd4, 0xb8, 0x09, 0x2d, 0x3b, 0xdd, 0x14, 0xa0, 0xda, 0x07, 0x6b,
|
||||||
0x3d, 0xa6, 0xa3, 0xc0, 0xf6, 0x5e, 0x4b, 0x19, 0xf7, 0x2c, 0x24, 0x05, 0xd0, 0xae, 0xb5, 0x0e,
|
0xfb, 0x82, 0xc0, 0xfd, 0x4c, 0xd8, 0x7c, 0x00, 0xdd, 0x63, 0x3a, 0xf6, 0x2d, 0xf7, 0x95, 0x1c,
|
||||||
0xbd, 0x4c, 0x53, 0x11, 0xf1, 0x7b, 0x05, 0x36, 0x1e, 0xbb, 0xee, 0x92, 0x1c, 0xac, 0x43, 0x93,
|
0x72, 0x24, 0x42, 0x52, 0x00, 0xef, 0x9a, 0x6b, 0xd0, 0x4b, 0x35, 0x15, 0x33, 0x7f, 0x54, 0x60,
|
||||||
0x91, 0xd8, 0xa7, 0xdc, 0x4a, 0x55, 0x90, 0xbe, 0x07, 0x46, 0x9a, 0x20, 0xbe, 0x9a, 0xc0, 0xd7,
|
0xfd, 0x91, 0xe3, 0x2c, 0x49, 0xca, 0x1a, 0x34, 0x19, 0x89, 0x3c, 0xca, 0xad, 0x54, 0x45, 0x16,
|
||||||
0x56, 0xf8, 0x4e, 0x71, 0xcb, 0xec, 0x80, 0x61, 0xc7, 0xa3, 0x04, 0x89, 0xa8, 0x49, 0x2c, 0x24,
|
0x76, 0x41, 0x4f, 0x62, 0xc4, 0xa7, 0x09, 0x7c, 0x6d, 0x85, 0xef, 0x14, 0xb7, 0x8c, 0x0e, 0xe8,
|
||||||
0xb8, 0x40, 0x16, 0xd4, 0xc2, 0xb9, 0x74, 0x25, 0x05, 0x19, 0xca, 0xd5, 0x22, 0x7d, 0xcd, 0x12,
|
0x56, 0x34, 0x8e, 0x91, 0x18, 0x4d, 0x62, 0x21, 0xfe, 0x39, 0xb2, 0xa2, 0x16, 0xf6, 0x85, 0xa3,
|
||||||
0x7d, 0xad, 0x12, 0x7d, 0x20, 0xe8, 0x7b, 0x08, 0x86, 0xf0, 0x85, 0x36, 0x52, 0x85, 0xb2, 0xcb,
|
0x28, 0x51, 0x28, 0x1b, 0x45, 0x3a, 0x9b, 0x25, 0x3a, 0x5b, 0x25, 0x3a, 0x81, 0xaf, 0x31, 0x7c,
|
||||||
0x17, 0x23, 0x15, 0x76, 0xd7, 0xdc, 0x81, 0x9e, 0xed, 0xba, 0x94, 0xd1, 0x10, 0x41, 0x3f, 0xa3,
|
0x5d, 0xf8, 0x42, 0x1b, 0x89, 0x42, 0xd9, 0xe5, 0x8b, 0xb1, 0x0a, 0xbb, 0x6b, 0x6c, 0x43, 0xcf,
|
||||||
0x6e, 0x82, 0x50, 0x6b, 0x18, 0xfe, 0x16, 0x98, 0xf9, 0x58, 0x15, 0x05, 0x2f, 0x74, 0x3a, 0x74,
|
0x72, 0x1c, 0xca, 0x68, 0x80, 0xa0, 0x9f, 0x52, 0x27, 0x46, 0xa8, 0x1a, 0x86, 0xbf, 0x09, 0x46,
|
||||||
0x5e, 0xe7, 0xf1, 0xf0, 0x76, 0x21, 0xf1, 0x55, 0x11, 0xfb, 0x46, 0x96, 0x1b, 0x7d, 0x60, 0x0d,
|
0x3e, 0x56, 0x45, 0xc1, 0xf3, 0x2c, 0x1d, 0x59, 0x9e, 0xe7, 0xf1, 0xf0, 0x76, 0xa1, 0x10, 0xaa,
|
||||||
0xa0, 0x3f, 0x6b, 0x4d, 0x79, 0x7a, 0x00, 0xbb, 0x4f, 0x88, 0x47, 0x5e, 0xe7, 0x09, 0x49, 0x0c,
|
0x22, 0xf6, 0xf5, 0x34, 0x37, 0xd9, 0x81, 0x39, 0x80, 0xfe, 0xac, 0x35, 0xe5, 0xe9, 0x3e, 0xec,
|
||||||
0x6c, 0x9f, 0xc8, 0x1c, 0x72, 0x83, 0xb3, 0x4a, 0xca, 0xe0, 0x2d, 0xd8, 0x7e, 0x41, 0x13, 0xb6,
|
0x3c, 0x26, 0x2e, 0x79, 0x95, 0x27, 0x24, 0xd1, 0xb7, 0x3c, 0x22, 0x73, 0xc8, 0x0d, 0xce, 0x2a,
|
||||||
0xd4, 0x9c, 0xf5, 0x1d, 0xc0, 0x54, 0x40, 0x1b, 0xd7, 0xae, 0xc8, 0x15, 0x65, 0x2a, 0xb1, 0x48,
|
0x29, 0x83, 0x37, 0x61, 0xeb, 0x39, 0x8d, 0xd9, 0x52, 0x73, 0xe6, 0x77, 0x00, 0x53, 0x81, 0xcc,
|
||||||
0x22, 0x73, 0x22, 0xd5, 0x5a, 0x9b, 0xd0, 0x4e, 0x03, 0x7a, 0x75, 0x1c, 0x3a, 0xe7, 0x84, 0x25,
|
0x78, 0xe6, 0x8a, 0x5c, 0x52, 0xa6, 0x12, 0x8b, 0x24, 0x32, 0x3b, 0x54, 0xbd, 0xb6, 0x01, 0xed,
|
||||||
0xa2, 0xb4, 0x45, 0xbf, 0x25, 0x63, 0xe2, 0x79, 0xa2, 0xb2, 0x9b, 0xd6, 0xe7, 0xb0, 0x53, 0xf6,
|
0xc4, 0xa7, 0x97, 0xc7, 0x81, 0x7d, 0x46, 0x58, 0x2c, 0x4a, 0x5d, 0x34, 0x60, 0x3c, 0x21, 0xae,
|
||||||
0xaf, 0x0a, 0xf9, 0x1d, 0x68, 0x4f, 0xd9, 0x4a, 0xd0, 0x5b, 0x6d, 0x11, 0x5d, 0x9d, 0x63, 0x86,
|
0x2b, 0x2a, 0xbd, 0x69, 0x7e, 0x0e, 0xdb, 0x65, 0xff, 0xaa, 0x90, 0xdf, 0x81, 0xf6, 0x94, 0xad,
|
||||||
0x6c, 0xcd, 0x03, 0x7e, 0x13, 0x7a, 0xba, 0xe8, 0x85, 0x90, 0x2c, 0x05, 0x9b, 0xa5, 0x89, 0x92,
|
0x18, 0xbd, 0x69, 0x8b, 0xe8, 0xea, 0x1c, 0x33, 0x64, 0x6b, 0x1e, 0xf0, 0x3d, 0xe8, 0x65, 0x45,
|
||||||
0xf8, 0xad, 0x02, 0xab, 0x2a, 0x9d, 0x59, 0x49, 0xfd, 0x87, 0x45, 0xbb, 0x01, 0xad, 0x64, 0x92,
|
0x2f, 0x84, 0x64, 0x29, 0x58, 0x2c, 0x89, 0x95, 0xc4, 0xef, 0x15, 0x68, 0xa8, 0x74, 0xa6, 0x25,
|
||||||
0x30, 0xe2, 0x1f, 0xa9, 0xd2, 0xed, 0xbe, 0x69, 0xe9, 0x7a, 0xd0, 0xd2, 0x11, 0x2d, 0x4e, 0x79,
|
0xf5, 0x3f, 0x16, 0xed, 0x3a, 0xb4, 0xe2, 0xab, 0x98, 0x11, 0xef, 0x48, 0x95, 0x6e, 0xf7, 0x75,
|
||||||
0x69, 0xee, 0xc8, 0x19, 0xf3, 0x16, 0xb4, 0x22, 0x19, 0x29, 0x91, 0x48, 0xdb, 0x07, 0x3d, 0x15,
|
0x4b, 0xf7, 0x67, 0x68, 0x65, 0x11, 0x2d, 0x4e, 0x79, 0x69, 0x0e, 0xc9, 0x99, 0xf3, 0x16, 0xb4,
|
||||||
0x44, 0xc6, 0xc0, 0x94, 0x1d, 0x31, 0x77, 0xac, 0x3b, 0xb0, 0xfa, 0xd2, 0x76, 0xc6, 0xe8, 0x8c,
|
0x42, 0x19, 0x29, 0x91, 0x48, 0xdb, 0x07, 0x3d, 0x15, 0x44, 0xca, 0xc0, 0x94, 0x9d, 0x5a, 0x69,
|
||||||
0xdb, 0x77, 0x22, 0x45, 0x9b, 0x18, 0x93, 0x3e, 0xf1, 0xc3, 0x78, 0x22, 0xfc, 0x19, 0xd6, 0xb7,
|
0xee, 0xd4, 0xc5, 0xdc, 0xb9, 0x0d, 0x8d, 0x17, 0x96, 0x3d, 0x41, 0xe7, 0xdc, 0x9f, 0x1d, 0x2a,
|
||||||
0x38, 0x50, 0x64, 0x12, 0x54, 0xf6, 0x6e, 0x63, 0xad, 0x67, 0x38, 0xb3, 0xe4, 0xcd, 0xcc, 0x21,
|
0x1a, 0xc5, 0x1c, 0xf5, 0x88, 0x17, 0x44, 0x57, 0xc2, 0xbf, 0x6e, 0x7e, 0x8b, 0x03, 0x46, 0x26,
|
||||||
0xf3, 0x06, 0xac, 0xfa, 0xd2, 0xbe, 0x6a, 0x87, 0x0c, 0x90, 0xf2, 0x6a, 0x3d, 0x86, 0x1d, 0x39,
|
0x45, 0x65, 0xf3, 0x16, 0xd6, 0x7e, 0x8a, 0x3b, 0x4d, 0xe6, 0xcc, 0x5c, 0x32, 0x6e, 0x40, 0xc3,
|
||||||
0x7e, 0x97, 0x4e, 0xd9, 0x99, 0x89, 0x25, 0x63, 0x10, 0x61, 0x5b, 0x7b, 0xb0, 0x3b, 0x63, 0x42,
|
0x93, 0xf6, 0x55, 0x7b, 0xa4, 0x00, 0x95, 0x57, 0xf3, 0x11, 0x6c, 0xcb, 0xf9, 0xbc, 0x74, 0x0a,
|
||||||
0x15, 0xff, 0x1a, 0x74, 0x9f, 0x5e, 0x10, 0xac, 0x2e, 0x65, 0xd4, 0xfa, 0xab, 0x02, 0x75, 0xb1,
|
0xcf, 0x4c, 0x30, 0x19, 0x93, 0xa0, 0xc1, 0xdc, 0x85, 0x9d, 0x19, 0x13, 0xaa, 0x19, 0x56, 0xa1,
|
||||||
0xc3, 0xc3, 0xe5, 0x48, 0x94, 0x03, 0xe9, 0x6c, 0x9e, 0xfd, 0x6e, 0x89, 0x6a, 0x23, 0x0f, 0xa8,
|
0xfb, 0xe4, 0x9c, 0x60, 0xb5, 0x29, 0xa3, 0xe6, 0xdf, 0x15, 0xa8, 0x89, 0x1d, 0x1e, 0x2e, 0x47,
|
||||||
0x5e, 0x1a, 0xa1, 0x32, 0xe3, 0x18, 0xb4, 0xca, 0x83, 0xc8, 0xf9, 0x6c, 0x16, 0x8a, 0xdc, 0xb5,
|
0xa2, 0x1c, 0x48, 0x67, 0xf3, 0xec, 0x77, 0x4b, 0xd4, 0xeb, 0x79, 0x40, 0xb5, 0xd2, 0x48, 0x95,
|
||||||
0x16, 0x70, 0x57, 0x9c, 0x26, 0xb0, 0x68, 0x9a, 0xfc, 0x51, 0x81, 0xce, 0xd7, 0x84, 0x5d, 0x86,
|
0x15, 0x80, 0x41, 0xab, 0xbc, 0x88, 0x1a, 0x98, 0xcd, 0x4a, 0x91, 0xbb, 0xd6, 0x02, 0xee, 0x8a,
|
||||||
0xf1, 0x39, 0xcf, 0x50, 0x52, 0x6a, 0x5f, 0x2c, 0xf3, 0xf8, 0x6a, 0x78, 0x36, 0x61, 0x58, 0x13,
|
0xd3, 0x05, 0x16, 0x4d, 0x97, 0x3f, 0x2b, 0xd0, 0xf9, 0x9a, 0xb0, 0x8b, 0x20, 0x3a, 0xe3, 0x19,
|
||||||
0x22, 0x95, 0x3c, 0x1e, 0xdc, 0x39, 0xb2, 0x65, 0xd3, 0xd6, 0xc4, 0x1e, 0xd6, 0xed, 0xab, 0xab,
|
0x8a, 0x4b, 0xed, 0x8c, 0x65, 0x1f, 0x5d, 0x0e, 0x47, 0x57, 0x0c, 0x6b, 0x44, 0xa4, 0x92, 0xc7,
|
||||||
0x21, 0x56, 0x61, 0x18, 0xcb, 0x3e, 0x16, 0x62, 0xb8, 0xe5, 0xc6, 0x61, 0x14, 0x11, 0x19, 0xa9,
|
0x83, 0x3b, 0x47, 0x96, 0x6c, 0x62, 0x4d, 0xec, 0x61, 0x1d, 0xbf, 0xbc, 0x1c, 0x62, 0x55, 0x06,
|
||||||
0xc1, 0x8d, 0x9d, 0x64, 0xc6, 0x1a, 0x99, 0x14, 0xee, 0x44, 0xca, 0xd8, 0x6a, 0x66, 0xec, 0x44,
|
0x91, 0xec, 0x6b, 0x21, 0x86, 0x5b, 0x4e, 0x14, 0x84, 0x21, 0x91, 0x91, 0xea, 0xdc, 0xd8, 0x49,
|
||||||
0x1b, 0x6b, 0xe6, 0xc4, 0x32, 0x63, 0x2d, 0x51, 0x52, 0x3e, 0x34, 0x0f, 0xa3, 0xf4, 0x34, 0xb1,
|
0x6a, 0xac, 0x9e, 0x4a, 0xe1, 0x4e, 0xa8, 0x8c, 0x35, 0x52, 0x63, 0x27, 0x99, 0xb1, 0x66, 0x4e,
|
||||||
0x47, 0x84, 0x4f, 0x12, 0x16, 0x32, 0xdb, 0x1b, 0xa6, 0x7c, 0x29, 0xa0, 0x1b, 0xe6, 0x16, 0x74,
|
0x2c, 0x35, 0xd6, 0x12, 0x25, 0xe5, 0x41, 0xf3, 0x30, 0x4c, 0x4e, 0x63, 0x6b, 0x4c, 0xf8, 0x64,
|
||||||
0x22, 0x12, 0x63, 0x51, 0xaa, 0xdd, 0x2a, 0x12, 0x65, 0x98, 0xd7, 0x60, 0x53, 0x2c, 0x87, 0x34,
|
0x61, 0x01, 0xb3, 0xdc, 0x61, 0xc2, 0x97, 0x02, 0xba, 0x6e, 0x6c, 0x42, 0x27, 0x24, 0x11, 0x16,
|
||||||
0x18, 0x9e, 0x93, 0x38, 0x20, 0x9e, 0x1f, 0xba, 0x44, 0xc5, 0xb1, 0x07, 0x1b, 0xfa, 0x90, 0xf7,
|
0xa5, 0xda, 0xad, 0x22, 0x51, 0xba, 0x71, 0x0d, 0x36, 0xc4, 0x72, 0x48, 0xfd, 0xe1, 0x19, 0x89,
|
||||||
0xb2, 0x38, 0x12, 0xf1, 0x58, 0x27, 0xd0, 0x3b, 0x19, 0xe3, 0xed, 0x82, 0x79, 0x34, 0x18, 0x3d,
|
0x7c, 0xe2, 0x7a, 0x81, 0x43, 0x54, 0x1c, 0xbb, 0xb0, 0x9e, 0x1d, 0xf2, 0xde, 0x16, 0x47, 0x22,
|
||||||
0xb1, 0x99, 0x6d, 0xae, 0x61, 0x9e, 0x48, 0x4c, 0x43, 0x37, 0x51, 0x0e, 0x51, 0x9b, 0x49, 0x11,
|
0x1e, 0xf3, 0x04, 0x7a, 0x27, 0x13, 0xbc, 0x7e, 0x30, 0x97, 0xfa, 0xe3, 0xc7, 0x16, 0xb3, 0x8c,
|
||||||
0xe2, 0x0e, 0xb3, 0x23, 0x49, 0x1a, 0x7e, 0x2f, 0xa6, 0x47, 0x8c, 0xfa, 0xca, 0xa1, 0xf5, 0xbd,
|
0x55, 0xcc, 0x13, 0x89, 0x68, 0xe0, 0xc4, 0xca, 0x21, 0x6a, 0x33, 0x29, 0x42, 0x9c, 0x61, 0x7a,
|
||||||
0x08, 0x42, 0x12, 0x6f, 0xe1, 0x97, 0x59, 0x83, 0x95, 0x5f, 0xe6, 0xb5, 0x2c, 0x5f, 0x59, 0xa0,
|
0x24, 0x49, 0xc3, 0xef, 0xc7, 0xf4, 0x88, 0x51, 0x4f, 0x39, 0x34, 0xbf, 0x17, 0x41, 0x48, 0xe2,
|
||||||
0xfb, 0xb0, 0xc6, 0x34, 0x8a, 0x21, 0x56, 0xad, 0xad, 0x1a, 0x63, 0x5b, 0x49, 0x16, 0x31, 0x5a,
|
0x4d, 0xfc, 0x52, 0x67, 0x60, 0xe5, 0x97, 0x7a, 0x35, 0xcd, 0x57, 0x1a, 0xe8, 0x3e, 0xac, 0xb2,
|
||||||
0x9f, 0x01, 0xbc, 0x14, 0x7d, 0x28, 0x10, 0xe3, 0x2c, 0xc9, 0x13, 0x84, 0x44, 0xfb, 0xf6, 0x95,
|
0x0c, 0xc5, 0x10, 0xab, 0xd6, 0x52, 0x8d, 0xb1, 0xa5, 0x24, 0x8b, 0x18, 0xcd, 0xcf, 0x00, 0x5e,
|
||||||
0x66, 0x87, 0x6f, 0x61, 0x4c, 0x3f, 0xd8, 0xd4, 0x73, 0xd4, 0xc5, 0xc3, 0xb0, 0xfe, 0xae, 0x40,
|
0x88, 0x3e, 0x14, 0x88, 0x71, 0xb6, 0xe4, 0x09, 0x42, 0xa2, 0x3d, 0xeb, 0x32, 0x63, 0x87, 0x6f,
|
||||||
0x5b, 0x5a, 0x90, 0x20, 0xd1, 0x84, 0x83, 0xbd, 0x97, 0x99, 0xb8, 0x99, 0x59, 0x2c, 0x7e, 0xad,
|
0x61, 0x4c, 0x3f, 0x58, 0xd4, 0xb5, 0xd5, 0xc5, 0x44, 0x37, 0xff, 0xa9, 0x40, 0x5b, 0x5a, 0x90,
|
||||||
0x72, 0x3e, 0xb1, 0x0c, 0x93, 0x4b, 0x3b, 0x52, 0x5e, 0x6a, 0x8b, 0xc4, 0xee, 0x40, 0x47, 0x66,
|
0x20, 0xd1, 0x84, 0x8d, 0xbd, 0x97, 0x9a, 0xd8, 0x4b, 0x2d, 0x16, 0xbf, 0x5e, 0x39, 0x9f, 0x58,
|
||||||
0x43, 0x09, 0x1a, 0x8b, 0x04, 0xef, 0xf1, 0x79, 0x88, 0x48, 0xc4, 0xf8, 0x6c, 0x1f, 0x5c, 0x2f,
|
0x86, 0xf1, 0x85, 0x15, 0x2a, 0x2f, 0xda, 0x22, 0xb1, 0xdb, 0xd0, 0x91, 0xd9, 0x50, 0x82, 0xfa,
|
||||||
0x48, 0x08, 0x8c, 0xfb, 0xe2, 0xf7, 0x69, 0xc0, 0xe2, 0xc9, 0xe0, 0x1e, 0xc0, 0x74, 0xc5, 0xdb,
|
0x22, 0xc1, 0xbb, 0x7c, 0x3e, 0x22, 0x12, 0x31, 0x4e, 0xdb, 0x07, 0xd7, 0x0b, 0x12, 0x02, 0xe3,
|
||||||
0xee, 0x9c, 0x4c, 0x54, 0x65, 0x63, 0x24, 0x17, 0xb6, 0x97, 0xaa, 0xc8, 0x1f, 0x55, 0x1f, 0x56,
|
0xbe, 0xf8, 0x7d, 0xe2, 0xb3, 0xe8, 0x6a, 0x70, 0x17, 0x60, 0xba, 0xe2, 0x6d, 0x77, 0x46, 0xae,
|
||||||
0xac, 0xaf, 0x60, 0xed, 0x0b, 0xef, 0x9c, 0x86, 0x39, 0x15, 0x94, 0xf2, 0xed, 0x1f, 0xc3, 0x58,
|
0x54, 0x65, 0x63, 0x24, 0xe7, 0x96, 0x9b, 0xa8, 0xc8, 0x1f, 0x56, 0x1f, 0x54, 0xcc, 0xaf, 0x60,
|
||||||
0xc5, 0xcb, 0x97, 0x34, 0xc0, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x8c, 0xa6, 0x57, 0x34, 0x69, 0x4f,
|
0xf5, 0x0b, 0xf7, 0x8c, 0x06, 0x39, 0x15, 0x94, 0xf2, 0xac, 0x1f, 0x83, 0x48, 0xc5, 0xcb, 0x97,
|
||||||
0xd6, 0xcb, 0x9f, 0x35, 0x80, 0xa9, 0x31, 0xf3, 0x11, 0x0c, 0x68, 0x38, 0xc4, 0x92, 0xba, 0xa0,
|
0xd4, 0xc7, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x08, 0xa7, 0x57, 0x38, 0x69, 0x4f, 0xd6, 0xcb, 0x5f,
|
||||||
0x0e, 0x91, 0x2d, 0x30, 0x8c, 0x89, 0x93, 0xc6, 0x09, 0xbd, 0x20, 0x6a, 0xfe, 0xed, 0xa8, 0x58,
|
0x1a, 0xc0, 0xd4, 0x98, 0xf1, 0x10, 0x06, 0x34, 0x18, 0x62, 0x49, 0x9d, 0x53, 0x9b, 0xc8, 0x16,
|
||||||
0xca, 0x18, 0x3e, 0x80, 0xed, 0xa9, 0xae, 0x9b, 0x53, 0xab, 0x2e, 0x55, 0x7b, 0x00, 0x9b, 0xa8,
|
0x18, 0x46, 0xc4, 0x4e, 0xa2, 0x98, 0x9e, 0x13, 0x35, 0xff, 0xb6, 0x55, 0x2c, 0x65, 0x0c, 0x1f,
|
||||||
0x86, 0x83, 0x2b, 0x2d, 0x28, 0xd5, 0x96, 0x2a, 0x7d, 0x0c, 0x7b, 0x39, 0x9c, 0xbc, 0x52, 0x73,
|
0xc0, 0xd6, 0x54, 0xd7, 0xc9, 0xa9, 0x55, 0x97, 0xaa, 0xdd, 0x87, 0x0d, 0x54, 0xc3, 0xc1, 0x95,
|
||||||
0xaa, 0xc6, 0x52, 0xd5, 0x0f, 0x61, 0x07, 0x55, 0x2f, 0x6d, 0xca, 0xca, 0x7a, 0xf5, 0x7f, 0x81,
|
0x14, 0x94, 0xb4, 0xa5, 0x4a, 0x1f, 0xc3, 0x6e, 0x0e, 0x27, 0xaf, 0xd4, 0x9c, 0xaa, 0xbe, 0x54,
|
||||||
0xd3, 0x27, 0xf1, 0xa8, 0x80, 0xb3, 0xb1, 0x54, 0xe9, 0x3d, 0xd8, 0x40, 0xa5, 0x92, 0x9f, 0xd5,
|
0xf5, 0x43, 0xd8, 0x46, 0xd5, 0x0b, 0x8b, 0xb2, 0xb2, 0x5e, 0xed, 0x3f, 0xe0, 0xf4, 0x48, 0x34,
|
||||||
0xd7, 0xa9, 0x24, 0xc4, 0x61, 0x38, 0x55, 0x72, 0x2a, 0xcd, 0x65, 0x2a, 0xf8, 0x79, 0xe9, 0x3c,
|
0x2e, 0xe0, 0xac, 0x2f, 0x55, 0x7a, 0x0f, 0xd6, 0x51, 0xa9, 0xe4, 0xa7, 0xf1, 0x2a, 0x95, 0x98,
|
||||||
0x4f, 0x47, 0x84, 0x79, 0x67, 0xba, 0xfa, 0xdf, 0xb4, 0x81, 0x7e, 0xa9, 0x42, 0xfb, 0x70, 0x14,
|
0xd8, 0x0c, 0xa7, 0x4a, 0x4e, 0xa5, 0xb9, 0x4c, 0x05, 0x3f, 0x2f, 0x9d, 0x67, 0xc9, 0x98, 0x30,
|
||||||
0x87, 0x69, 0x54, 0xe8, 0x72, 0x59, 0xc3, 0x33, 0x5d, 0x2e, 0x65, 0xee, 0x42, 0x47, 0x7e, 0x3d,
|
0x77, 0x94, 0x55, 0xff, 0xeb, 0x36, 0xd0, 0x2f, 0x55, 0x68, 0x1f, 0x8e, 0xa3, 0x20, 0x09, 0x0b,
|
||||||
0x95, 0x98, 0x6c, 0x2e, 0x73, 0xb6, 0xd4, 0xf9, 0x25, 0xe8, 0x8c, 0x63, 0x56, 0x82, 0xc5, 0xf6,
|
0x5d, 0x2e, 0x6b, 0x78, 0xa6, 0xcb, 0xa5, 0xcc, 0x1d, 0xe8, 0xc8, 0xaf, 0xa7, 0x12, 0x93, 0xcd,
|
||||||
0xca, 0x95, 0xdf, 0x27, 0xd0, 0x1d, 0xcb, 0x40, 0x94, 0xa4, 0x4c, 0xe5, 0xed, 0xcc, 0xf3, 0x14,
|
0x65, 0xcc, 0x96, 0x3a, 0xbf, 0x14, 0x8d, 0x38, 0x66, 0x25, 0x58, 0x6c, 0xaf, 0x5c, 0xf9, 0x7d,
|
||||||
0xe0, 0x7e, 0x3e, 0x60, 0xd9, 0x44, 0xcf, 0x61, 0x63, 0x66, 0xb3, 0xd8, 0x4b, 0x56, 0xbe, 0x97,
|
0x02, 0xdd, 0x89, 0x0c, 0x44, 0x49, 0xca, 0x54, 0xde, 0x4a, 0x3d, 0x4f, 0x01, 0xee, 0xe7, 0x03,
|
||||||
0xda, 0x07, 0x9b, 0xca, 0x6c, 0x5e, 0x4b, 0x34, 0x58, 0x04, 0x75, 0x89, 0xe7, 0x5d, 0xe8, 0x06,
|
0x96, 0x4d, 0xf4, 0x0c, 0xd6, 0x67, 0x36, 0x8b, 0xbd, 0x64, 0xe6, 0x7b, 0xa9, 0x7d, 0xb0, 0xa1,
|
||||||
0xf2, 0xa3, 0xa3, 0x99, 0xa8, 0xe5, 0x14, 0x0b, 0x1f, 0x24, 0x64, 0xc3, 0x11, 0xf8, 0xe6, 0xb2,
|
0xcc, 0xe6, 0xb5, 0x44, 0x83, 0x85, 0x50, 0x93, 0x78, 0xde, 0x85, 0xae, 0x2f, 0x3f, 0x3a, 0x19,
|
||||||
0x91, 0xe7, 0x16, 0xf3, 0xc1, 0x2b, 0x02, 0xc5, 0xfc, 0x48, 0xd1, 0xaf, 0x6e, 0x7f, 0xf3, 0xde,
|
0x13, 0x5a, 0x4e, 0xb1, 0xf0, 0x41, 0x42, 0x36, 0x6c, 0x81, 0x6f, 0x2e, 0x1b, 0x79, 0x6e, 0x31,
|
||||||
0x1d, 0x07, 0xbf, 0x36, 0xa0, 0xf6, 0xf8, 0xe8, 0x4b, 0xf3, 0x15, 0xac, 0x95, 0x5e, 0x4b, 0x66,
|
0x1f, 0xbc, 0x22, 0x50, 0xcc, 0x0b, 0x15, 0xfd, 0xea, 0x36, 0x38, 0xef, 0x1d, 0x72, 0xf0, 0x5b,
|
||||||
0x36, 0x56, 0xe6, 0x3f, 0xe1, 0x06, 0xff, 0x5f, 0x74, 0xac, 0x2e, 0x0e, 0x2b, 0xdc, 0x66, 0xe9,
|
0x1d, 0xb4, 0x47, 0x47, 0x5f, 0x1a, 0x2f, 0x61, 0xb5, 0xf4, 0x7a, 0x32, 0xd2, 0xb1, 0x32, 0xff,
|
||||||
0x56, 0xa1, 0x6d, 0xce, 0xbf, 0xb0, 0x68, 0x9b, 0x8b, 0x2e, 0x23, 0x2b, 0xe6, 0x47, 0xd0, 0x90,
|
0x89, 0x37, 0x78, 0x73, 0xd1, 0xb1, 0xba, 0x38, 0xac, 0x70, 0x9b, 0xa5, 0x5b, 0x45, 0x66, 0x73,
|
||||||
0x6f, 0x2b, 0x73, 0x4b, 0xc9, 0x16, 0x1e, 0x69, 0x83, 0xed, 0xd2, 0xae, 0x56, 0x7c, 0x01, 0xdd,
|
0xfe, 0x85, 0x25, 0xb3, 0xb9, 0xe8, 0x32, 0xb2, 0x62, 0x7c, 0x04, 0x75, 0xf9, 0xd6, 0x32, 0x36,
|
||||||
0xc2, 0x23, 0xd5, 0xbc, 0x56, 0xf0, 0x55, 0x7c, 0x9a, 0x0d, 0xfe, 0x37, 0xff, 0x50, 0x5b, 0x3b,
|
0x95, 0x6c, 0xe1, 0xd1, 0x36, 0xd8, 0x2a, 0xed, 0x66, 0x8a, 0xcf, 0xa1, 0x5b, 0x78, 0xc5, 0x1a,
|
||||||
0x04, 0x98, 0xbe, 0x71, 0xcc, 0xbe, 0x92, 0x9e, 0x79, 0xe2, 0x0d, 0xf6, 0xe6, 0x9c, 0x68, 0x23,
|
0xd7, 0x0a, 0xbe, 0x8a, 0x4f, 0xb5, 0xc1, 0x1b, 0xf3, 0x0f, 0x33, 0x6b, 0x87, 0x00, 0xd3, 0x37,
|
||||||
0xa7, 0xb0, 0x5e, 0x7e, 0xc4, 0x98, 0x25, 0x56, 0xcb, 0x4f, 0x8e, 0xc1, 0x8d, 0x85, 0xe7, 0x79,
|
0x8f, 0xd1, 0x57, 0xd2, 0x33, 0x4f, 0xbe, 0xc1, 0xee, 0x9c, 0x93, 0xcc, 0xc8, 0x29, 0xac, 0x95,
|
||||||
0xb3, 0xe5, 0xa7, 0x8c, 0x36, 0xbb, 0xe0, 0x61, 0xa4, 0xcd, 0x2e, 0x7c, 0x03, 0xad, 0x98, 0xdf,
|
0x1f, 0x35, 0x46, 0x89, 0xd5, 0xf2, 0x13, 0x64, 0x70, 0x63, 0xe1, 0x79, 0xde, 0x6c, 0xf9, 0x69,
|
||||||
0x40, 0xaf, 0xf8, 0x0a, 0x31, 0x33, 0x92, 0xe6, 0x3e, 0x8e, 0x06, 0xd7, 0x17, 0x9c, 0x6a, 0x83,
|
0x93, 0x99, 0x5d, 0xf0, 0x50, 0xca, 0xcc, 0x2e, 0x7c, 0x13, 0xad, 0x18, 0xdf, 0x40, 0xaf, 0xf8,
|
||||||
0xef, 0xcb, 0x46, 0xc0, 0x9b, 0x4b, 0x96, 0xb3, 0xdc, 0x13, 0x65, 0xb0, 0x55, 0xdc, 0xd4, 0x5a,
|
0x2a, 0x31, 0x52, 0x92, 0xe6, 0x3e, 0x96, 0x06, 0xd7, 0x17, 0x9c, 0x66, 0x06, 0xdf, 0x97, 0x8d,
|
||||||
0xf7, 0xa1, 0x21, 0xef, 0xa3, 0xba, 0x00, 0x0a, 0xd7, 0xd3, 0x41, 0x27, 0xbf, 0x6b, 0xad, 0xdc,
|
0x80, 0x37, 0x97, 0x34, 0x67, 0xb9, 0x27, 0xcb, 0x60, 0xb3, 0xb8, 0x99, 0x69, 0xdd, 0x83, 0xba,
|
||||||
0xaf, 0xe0, 0xcc, 0x6b, 0x3e, 0x23, 0x4c, 0x76, 0x47, 0xde, 0xd5, 0x8c, 0x8a, 0xd8, 0xe4, 0x2a,
|
0xbc, 0x8f, 0x66, 0x05, 0x50, 0xb8, 0x9e, 0x0e, 0x3a, 0xf9, 0x5d, 0x73, 0xe5, 0x5e, 0x05, 0x67,
|
||||||
0x67, 0x0d, 0xf1, 0x1f, 0xca, 0x83, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x06, 0x77, 0x88, 0xa2,
|
0x5e, 0xf3, 0x29, 0x61, 0xb2, 0x3b, 0xf2, 0xae, 0x66, 0x54, 0xc4, 0x26, 0x57, 0x19, 0xd5, 0xc5,
|
||||||
0x50, 0x11, 0x00, 0x00,
|
0x9f, 0x2c, 0xf7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xa9, 0x7b, 0x24, 0x71, 0x11, 0x00,
|
||||||
|
0x00,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ message CreateContainerRequest {
|
||||||
string stdin = 4; // path to the file where stdin will be read (optional)
|
string stdin = 4; // path to the file where stdin will be read (optional)
|
||||||
string stdout = 5; // path to file where stdout will be written (optional)
|
string stdout = 5; // path to file where stdout will be written (optional)
|
||||||
string stderr = 6; // path to file where stderr will be written (optional)
|
string stderr = 6; // path to file where stderr will be written (optional)
|
||||||
|
repeated string labels = 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
message CreateContainerResponse {
|
message CreateContainerResponse {
|
||||||
|
|
@ -130,6 +131,7 @@ message Container {
|
||||||
string bundlePath = 3; // Path to OCI bundle
|
string bundlePath = 3; // Path to OCI bundle
|
||||||
repeated Process processes = 4; // List of processes which run in container
|
repeated Process processes = 4; // List of processes which run in container
|
||||||
string status = 5; // Container status ("running", "paused", etc.)
|
string status = 5; // Container status ("running", "paused", etc.)
|
||||||
|
repeated string labels = 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Machine is information about machine on which containerd is run
|
// Machine is information about machine on which containerd is run
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,11 @@ var startCommand = cli.Command{
|
||||||
Name: "attach,a",
|
Name: "attach,a",
|
||||||
Usage: "connect to the stdio of the container",
|
Usage: "connect to the stdio of the container",
|
||||||
},
|
},
|
||||||
|
cli.StringSliceFlag{
|
||||||
|
Name: "label,l",
|
||||||
|
Value: &cli.StringSlice{},
|
||||||
|
Usage: "set labels for the container",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Action: func(context *cli.Context) {
|
Action: func(context *cli.Context) {
|
||||||
var (
|
var (
|
||||||
|
|
@ -144,6 +149,7 @@ var startCommand = cli.Command{
|
||||||
Stdin: s.stdin,
|
Stdin: s.stdin,
|
||||||
Stdout: s.stdout,
|
Stdout: s.stdout,
|
||||||
Stderr: s.stderr,
|
Stderr: s.stderr,
|
||||||
|
Labels: context.StringSlice("label"),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
if context.Bool("attach") {
|
if context.Bool("attach") {
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,8 @@ type Container interface {
|
||||||
Checkpoint(Checkpoint) error
|
Checkpoint(Checkpoint) error
|
||||||
// DeleteCheckpoint deletes the checkpoint for the provided name
|
// DeleteCheckpoint deletes the checkpoint for the provided name
|
||||||
DeleteCheckpoint(name string) error
|
DeleteCheckpoint(name string) error
|
||||||
|
// Labels are user provided labels for the container
|
||||||
|
Labels() []string
|
||||||
// Stats returns realtime container stats and resource information
|
// Stats returns realtime container stats and resource information
|
||||||
// Stats() (*Stat, error) // OOM signals the channel if the container received an OOM notification
|
// Stats() (*Stat, error) // OOM signals the channel if the container received an OOM notification
|
||||||
// OOM() (<-chan struct{}, error)
|
// OOM() (<-chan struct{}, error)
|
||||||
|
|
@ -67,11 +69,12 @@ func NewStdio(stdin, stdout, stderr string) Stdio {
|
||||||
}
|
}
|
||||||
|
|
||||||
// New returns a new container
|
// New returns a new container
|
||||||
func New(root, id, bundle string) (Container, error) {
|
func New(root, id, bundle string, labels []string) (Container, error) {
|
||||||
c := &container{
|
c := &container{
|
||||||
root: root,
|
root: root,
|
||||||
id: id,
|
id: id,
|
||||||
bundle: bundle,
|
bundle: bundle,
|
||||||
|
labels: labels,
|
||||||
processes: make(map[string]*process),
|
processes: make(map[string]*process),
|
||||||
}
|
}
|
||||||
if err := os.Mkdir(filepath.Join(root, id), 0755); err != nil {
|
if err := os.Mkdir(filepath.Join(root, id), 0755); err != nil {
|
||||||
|
|
@ -84,6 +87,7 @@ func New(root, id, bundle string) (Container, error) {
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
if err := json.NewEncoder(f).Encode(state{
|
if err := json.NewEncoder(f).Encode(state{
|
||||||
Bundle: bundle,
|
Bundle: bundle,
|
||||||
|
Labels: labels,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -104,6 +108,7 @@ func Load(root, id string) (Container, error) {
|
||||||
root: root,
|
root: root,
|
||||||
id: id,
|
id: id,
|
||||||
bundle: s.Bundle,
|
bundle: s.Bundle,
|
||||||
|
labels: s.Labels,
|
||||||
processes: make(map[string]*process),
|
processes: make(map[string]*process),
|
||||||
}
|
}
|
||||||
dirs, err := ioutil.ReadDir(filepath.Join(root, id))
|
dirs, err := ioutil.ReadDir(filepath.Join(root, id))
|
||||||
|
|
@ -149,6 +154,7 @@ type container struct {
|
||||||
bundle string
|
bundle string
|
||||||
processes map[string]*process
|
processes map[string]*process
|
||||||
stdio Stdio
|
stdio Stdio
|
||||||
|
labels []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *container) ID() string {
|
func (c *container) ID() string {
|
||||||
|
|
@ -159,6 +165,10 @@ func (c *container) Path() string {
|
||||||
return c.bundle
|
return c.bundle
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *container) Labels() []string {
|
||||||
|
return c.labels
|
||||||
|
}
|
||||||
|
|
||||||
func (c *container) Start(checkpoint string, s Stdio) (Process, error) {
|
func (c *container) Start(checkpoint string, s Stdio) (Process, error) {
|
||||||
processRoot := filepath.Join(c.root, c.id, InitProcessID)
|
processRoot := filepath.Join(c.root, c.id, InitProcessID)
|
||||||
if err := os.Mkdir(processRoot, 0755); err != nil {
|
if err := os.Mkdir(processRoot, 0755); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -36,10 +36,11 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
type state struct {
|
type state struct {
|
||||||
Bundle string `json:"bundle"`
|
Bundle string `json:"bundle"`
|
||||||
Stdin string `json:"stdin"`
|
Labels []string `json:"labels"`
|
||||||
Stdout string `json:"stdout"`
|
Stdin string `json:"stdin"`
|
||||||
Stderr string `json:"stderr"`
|
Stdout string `json:"stdout"`
|
||||||
|
Stderr string `json:"stderr"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProcessState struct {
|
type ProcessState struct {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ type StartEvent struct {
|
||||||
|
|
||||||
func (h *StartEvent) Handle(e *Event) error {
|
func (h *StartEvent) Handle(e *Event) error {
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
container, err := runtime.New(h.s.stateDir, e.ID, e.BundlePath)
|
container, err := runtime.New(h.s.stateDir, e.ID, e.BundlePath, e.Labels)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ type Event struct {
|
||||||
ResizeTty bool
|
ResizeTty bool
|
||||||
Width int
|
Width int
|
||||||
Height int
|
Height int
|
||||||
|
Labels []string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Handler interface {
|
type Handler interface {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue