From b2e649b1641c12cac4afbceb1a1de515a4df9dcb Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 14 Dec 2015 16:27:28 -0800 Subject: [PATCH 1/2] Add console to proto Signed-off-by: Michael Crosby --- api/grpc/types/api.pb.go | 183 ++++++++++++++++++++------------------- api/grpc/types/api.proto | 1 + 2 files changed, 93 insertions(+), 91 deletions(-) diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go index 80daf9a..798e3dc 100644 --- a/api/grpc/types/api.pb.go +++ b/api/grpc/types/api.pb.go @@ -68,6 +68,7 @@ type CreateContainerRequest struct { Stdin string `protobuf:"bytes,3,opt,name=stdin" json:"stdin,omitempty"` Stdout string `protobuf:"bytes,4,opt,name=stdout" json:"stdout,omitempty"` Stderr string `protobuf:"bytes,5,opt,name=stderr" json:"stderr,omitempty"` + Console string `protobuf:"bytes,6,opt,name=console" json:"console,omitempty"` Checkpoint string `protobuf:"bytes,7,opt,name=checkpoint" json:"checkpoint,omitempty"` } @@ -1081,95 +1082,95 @@ var _API_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 1426 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xd9, 0x6e, 0x1c, 0x55, - 0x13, 0xf6, 0xcc, 0xf4, 0x6c, 0x35, 0x8b, 0xed, 0x76, 0xec, 0x8c, 0xe7, 0xff, 0x43, 0x92, 0x26, - 0x40, 0x84, 0x22, 0x2b, 0x38, 0x2c, 0x21, 0x5c, 0x40, 0x70, 0xa2, 0x04, 0x94, 0x80, 0x95, 0xd8, - 0x48, 0xdc, 0x30, 0x6a, 0x77, 0x1f, 0x66, 0x0e, 0xd3, 0x1b, 0xdd, 0xa7, 0xbd, 0x88, 0x37, 0xe0, - 0x81, 0x78, 0x00, 0x24, 0xee, 0x79, 0x0e, 0x9e, 0x82, 0x3a, 0x4b, 0x9f, 0x5e, 0x66, 0x09, 0x5c, - 0x70, 0x33, 0xd2, 0xa9, 0xae, 0xfa, 0xaa, 0xea, 0xab, 0x65, 0xce, 0x81, 0xae, 0x1d, 0xd1, 0x83, - 0x28, 0x0e, 0x59, 0x68, 0x36, 0xd9, 0x55, 0x44, 0x12, 0xeb, 0x17, 0xd8, 0x3b, 0x8a, 0x89, 0xcd, - 0xc8, 0x51, 0x18, 0x30, 0x9b, 0x06, 0x24, 0x7e, 0x45, 0x7e, 0x4e, 0x49, 0xc2, 0x4c, 0x80, 0x3a, - 0x75, 0x47, 0xb5, 0x5b, 0xb5, 0xbb, 0x5d, 0x13, 0x0f, 0x67, 0x69, 0xe0, 0x7a, 0xe4, 0xd8, 0x66, - 0xb3, 0x51, 0x5d, 0xc8, 0x06, 0xd0, 0x4c, 0x98, 0x4b, 0x83, 0x51, 0x43, 0x1c, 0x87, 0xd0, 0xc2, - 0x63, 0x98, 0xb2, 0x91, 0x51, 0x38, 0x93, 0x38, 0x1e, 0x35, 0x33, 0x08, 0x67, 0x46, 0x9c, 0x79, - 0x14, 0xd2, 0x80, 0x8d, 0xda, 0x5c, 0x66, 0xed, 0xc3, 0xf5, 0x05, 0xe7, 0x49, 0x14, 0x06, 0x09, - 0xb1, 0x1e, 0xc2, 0xe0, 0x35, 0x9d, 0x06, 0xb6, 0xb7, 0x2c, 0x9c, 0x1e, 0x34, 0x22, 0x3c, 0xf0, - 0x38, 0x06, 0xc2, 0x91, 0xd0, 0x14, 0x81, 0x0c, 0xac, 0x2d, 0x18, 0x66, 0x96, 0x0a, 0x8b, 0xc1, - 0xf6, 0x63, 0xd7, 0x3d, 0x8e, 0x43, 0x87, 0x24, 0xc9, 0x32, 0xbc, 0x2d, 0xe8, 0x30, 0x12, 0xfb, - 0x94, 0x83, 0x70, 0xd0, 0x8e, 0xb9, 0x0f, 0x46, 0x9a, 0x90, 0x58, 0x40, 0xf6, 0x0e, 0x7b, 0x07, - 0x82, 0xac, 0x83, 0x53, 0x14, 0x99, 0x7d, 0x30, 0xec, 0x78, 0x9a, 0x60, 0x9a, 0x0d, 0x19, 0x0a, - 0x09, 0xce, 0x31, 0x47, 0x75, 0x70, 0x2e, 0xdc, 0x51, 0x4b, 0x24, 0xf7, 0x10, 0x0c, 0xa1, 0x8f, - 0xc2, 0x54, 0x79, 0x1a, 0xf0, 0xc3, 0x54, 0x47, 0xbe, 0x07, 0x43, 0xdb, 0x75, 0x29, 0xa3, 0x21, - 0x3a, 0x7e, 0x46, 0xdd, 0x04, 0xdd, 0x35, 0x30, 0x83, 0xdb, 0x60, 0x16, 0xe3, 0x95, 0x59, 0x64, - 0x49, 0x0b, 0x1c, 0xeb, 0x85, 0x66, 0x4e, 0x73, 0xba, 0x2c, 0xb1, 0x77, 0x4a, 0xa4, 0xd7, 0x45, - 0x32, 0xdb, 0x2a, 0x99, 0xdc, 0xd2, 0x1a, 0xc3, 0x68, 0x11, 0x4d, 0x91, 0xf7, 0x00, 0xae, 0x3f, - 0x21, 0x1e, 0x79, 0x93, 0x27, 0x64, 0x25, 0xb0, 0x7d, 0x22, 0x7b, 0x83, 0x03, 0x2e, 0x1a, 0x29, - 0xc0, 0xb7, 0x61, 0xf7, 0x05, 0x4d, 0xd8, 0x5a, 0x38, 0xeb, 0x7b, 0x80, 0x5c, 0x41, 0x83, 0x6b, - 0x57, 0xe4, 0x92, 0x32, 0x55, 0x29, 0xa4, 0x85, 0x39, 0x91, 0x28, 0x54, 0xc7, 0xdc, 0x81, 0x5e, - 0x1a, 0xd0, 0xcb, 0xd7, 0xa1, 0x33, 0x27, 0x2c, 0x11, 0x9d, 0xd8, 0x11, 0x8d, 0x3a, 0x23, 0x9e, - 0x27, 0x1a, 0xb1, 0x63, 0x7d, 0x01, 0x7b, 0x55, 0xff, 0x8a, 0xe1, 0x77, 0xa1, 0x97, 0xb3, 0x95, - 0xa0, 0xb7, 0xc6, 0x72, 0xba, 0x86, 0xd0, 0x7f, 0xcd, 0x90, 0x2d, 0x15, 0xb8, 0x75, 0x0b, 0x86, - 0xba, 0x81, 0xc5, 0x07, 0xd9, 0xfc, 0x36, 0x4b, 0x13, 0x95, 0xce, 0x1c, 0xda, 0xaa, 0x9c, 0xa5, - 0x32, 0xfe, 0x37, 0x8d, 0xe7, 0x41, 0x57, 0x87, 0xb3, 0xba, 0x46, 0x95, 0x99, 0x96, 0x43, 0x7c, - 0x1b, 0xba, 0x91, 0x8c, 0x93, 0x48, 0x3f, 0xbd, 0xc3, 0xa1, 0x0a, 0x21, 0x8b, 0x3f, 0x4f, 0x4d, - 0xcc, 0x35, 0xf6, 0x47, 0xfb, 0xa5, 0xed, 0xcc, 0xd0, 0x59, 0xd5, 0x97, 0x13, 0xa1, 0x92, 0x9e, - 0x51, 0x9f, 0xf8, 0x61, 0x7c, 0x25, 0xfc, 0x18, 0xd6, 0x77, 0x38, 0xdd, 0x92, 0x41, 0x45, 0xfd, - 0x1d, 0x6c, 0xd4, 0x2c, 0xe6, 0x8c, 0xf9, 0xad, 0x8c, 0x79, 0x9d, 0xcc, 0x4d, 0x68, 0xfb, 0xd2, - 0x97, 0xea, 0xe5, 0x2c, 0x38, 0x15, 0x81, 0xf5, 0x04, 0xf6, 0x4e, 0x23, 0xf7, 0x4d, 0xdb, 0x2c, - 0xdf, 0x18, 0xf9, 0x06, 0x91, 0x29, 0x35, 0xb2, 0xb5, 0xb4, 0x80, 0xa2, 0x9a, 0x77, 0x13, 0x06, - 0x4f, 0xcf, 0x09, 0x76, 0x47, 0x56, 0xfb, 0x3f, 0x6b, 0xd0, 0x14, 0x12, 0x9e, 0x31, 0x0f, 0x46, - 0xf9, 0x90, 0xfe, 0xea, 0xf9, 0x2a, 0xd4, 0xf8, 0x83, 0x0a, 0xf3, 0x46, 0x71, 0xa5, 0x35, 0x2b, - 0x2b, 0xad, 0x2d, 0xce, 0x98, 0xb7, 0x2a, 0xcb, 0xa8, 0x53, 0xca, 0x3b, 0x2b, 0x4a, 0x99, 0xbe, - 0xee, 0x0a, 0xfa, 0xca, 0xdb, 0x00, 0x56, 0x6d, 0x83, 0xdf, 0x6a, 0xd0, 0xff, 0x86, 0xb0, 0x8b, - 0x30, 0x9e, 0xf3, 0x22, 0x25, 0x95, 0xf1, 0xc3, 0x9e, 0x8d, 0x2f, 0x27, 0x67, 0x57, 0x8c, 0xc8, - 0xea, 0x1a, 0x3c, 0x1f, 0x94, 0x1c, 0xdb, 0x72, 0xe8, 0x44, 0x85, 0xcd, 0x6d, 0xe8, 0xbe, 0xba, - 0x9c, 0xe0, 0xfa, 0x0f, 0x63, 0x39, 0x87, 0x42, 0x0d, 0x45, 0x6e, 0x1c, 0x46, 0x11, 0x91, 0x99, - 0x1a, 0x1c, 0xec, 0x24, 0x03, 0x6b, 0x65, 0x5a, 0x28, 0x89, 0x14, 0x58, 0x3b, 0x03, 0x3b, 0xd1, - 0x60, 0x9d, 0x82, 0x5a, 0x06, 0xd6, 0x15, 0x5d, 0xe5, 0x43, 0xe7, 0x28, 0x4a, 0x4f, 0x13, 0x7b, - 0x4a, 0xf8, 0x26, 0x60, 0x21, 0xb3, 0xbd, 0x49, 0xca, 0x8f, 0x22, 0x74, 0xc3, 0xbc, 0x06, 0xfd, - 0x88, 0xc4, 0xd8, 0x97, 0x4a, 0x5a, 0x47, 0xa2, 0x0c, 0xf3, 0x7f, 0xb0, 0x23, 0x8e, 0x13, 0x1a, - 0x4c, 0xe6, 0x24, 0x0e, 0x88, 0xe7, 0x87, 0x2e, 0x51, 0x79, 0xec, 0xc3, 0xb6, 0xfe, 0xc8, 0x07, - 0x53, 0x7c, 0x12, 0xf9, 0x58, 0x27, 0x30, 0x3c, 0x99, 0xe1, 0x7f, 0x29, 0xf3, 0x68, 0x30, 0x7d, - 0x62, 0x33, 0xdb, 0xdc, 0xc4, 0x3a, 0x91, 0x98, 0x86, 0x6e, 0xa2, 0x1c, 0xa2, 0x35, 0x93, 0x2a, - 0xc4, 0x9d, 0x64, 0x9f, 0x24, 0x69, 0xb8, 0xfc, 0xf3, 0x4f, 0x8c, 0xfa, 0xca, 0xa1, 0xf5, 0x83, - 0x48, 0x42, 0x12, 0x6f, 0x41, 0x37, 0x0f, 0xb6, 0x26, 0xea, 0xb5, 0x99, 0xd5, 0x2b, 0x4b, 0xf4, - 0x00, 0x36, 0x99, 0x8e, 0x62, 0x82, 0x5d, 0x6b, 0xab, 0xd9, 0xd8, 0x55, 0x9a, 0xe5, 0x18, 0xad, - 0xcf, 0x01, 0x5e, 0x8a, 0x51, 0x14, 0x11, 0xe3, 0x6e, 0x2c, 0x12, 0x84, 0x44, 0xfb, 0xf6, 0xa5, - 0x66, 0x87, 0x8b, 0x30, 0xa7, 0x1f, 0x6d, 0xea, 0x39, 0xd8, 0x31, 0x32, 0xc0, 0xbf, 0x6a, 0xd0, - 0x93, 0x08, 0x32, 0x48, 0x84, 0x70, 0x70, 0xfc, 0x32, 0x88, 0x5b, 0x19, 0x62, 0xf9, 0xdf, 0xa6, - 0xe0, 0x13, 0xdb, 0x30, 0xb9, 0xb0, 0x23, 0xe5, 0xa5, 0xb1, 0x4a, 0xed, 0x3d, 0xe8, 0xcb, 0x6a, - 0x28, 0x45, 0x63, 0x95, 0xe2, 0x3d, 0x7e, 0x11, 0xc1, 0x48, 0xc4, 0x2e, 0xec, 0x1d, 0xde, 0x28, - 0x69, 0x88, 0x18, 0x0f, 0xc4, 0xef, 0xd3, 0x80, 0xc5, 0x57, 0xe3, 0x7b, 0x00, 0xf9, 0x89, 0x8f, - 0xdd, 0x9c, 0x5c, 0xa9, 0xce, 0xc6, 0x4c, 0xce, 0x6d, 0x2f, 0x55, 0x99, 0x3f, 0xaa, 0x3f, 0xac, - 0x59, 0x5f, 0xc3, 0xe6, 0x97, 0xde, 0x9c, 0x86, 0x05, 0x13, 0xd4, 0xf2, 0xed, 0x9f, 0xc2, 0x58, - 0xe5, 0xcb, 0x8f, 0x34, 0xc0, 0xa3, 0xa4, 0x0b, 0xe7, 0x3e, 0x8c, 0xd4, 0x36, 0xd5, 0x78, 0xb2, - 0x5f, 0x7e, 0x6f, 0x00, 0xe4, 0x60, 0xe6, 0x23, 0x18, 0xd3, 0x70, 0x82, 0x2d, 0x75, 0x4e, 0x1d, - 0x22, 0x47, 0x60, 0x12, 0x13, 0x27, 0x8d, 0x13, 0x7a, 0x4e, 0xd4, 0x0a, 0xdc, 0x53, 0xb9, 0x54, - 0x63, 0xf8, 0x08, 0x76, 0x73, 0x5b, 0xb7, 0x60, 0x56, 0x5f, 0x6b, 0xf6, 0x00, 0x76, 0xd0, 0x0c, - 0x17, 0x57, 0x5a, 0x32, 0x6a, 0xac, 0x35, 0xfa, 0x14, 0xf6, 0x0b, 0x71, 0xf2, 0x4e, 0x2d, 0x98, - 0x1a, 0x6b, 0x4d, 0x3f, 0x86, 0x3d, 0x34, 0xbd, 0xb0, 0x29, 0xab, 0xda, 0x35, 0xff, 0x41, 0x9c, - 0x3e, 0x89, 0xa7, 0xa5, 0x38, 0x5b, 0x6b, 0x8d, 0x3e, 0x80, 0x6d, 0x34, 0xaa, 0xf8, 0x69, 0xbf, - 0xc9, 0x24, 0x21, 0x0e, 0xc3, 0xad, 0x52, 0x30, 0xe9, 0xac, 0x33, 0xb1, 0x1e, 0x43, 0xff, 0x79, - 0x3a, 0x25, 0xcc, 0x3b, 0xd3, 0xdd, 0xff, 0x6f, 0x07, 0xe8, 0xd7, 0x3a, 0xf4, 0x8e, 0xa6, 0x71, - 0x98, 0x46, 0xa5, 0x29, 0x97, 0x3d, 0xbc, 0x30, 0xe5, 0x52, 0xe7, 0x2e, 0xf4, 0xe5, 0x1f, 0xa8, - 0x52, 0x93, 0xc3, 0x65, 0x2e, 0xb6, 0x3a, 0xbf, 0xc4, 0x9c, 0xf1, 0x98, 0x95, 0x62, 0x79, 0xbc, - 0x0a, 0xed, 0xf7, 0x19, 0x0c, 0x66, 0x32, 0x11, 0xa5, 0x29, 0x4b, 0x79, 0x27, 0xf3, 0x9c, 0x07, - 0x78, 0x50, 0x4c, 0x58, 0x0e, 0xd1, 0x73, 0xd8, 0x5e, 0x10, 0x96, 0x67, 0xc9, 0x2a, 0xce, 0x52, - 0xef, 0x70, 0x47, 0xc1, 0x16, 0xad, 0xc4, 0x80, 0x45, 0xd0, 0x94, 0xf1, 0xbc, 0x0f, 0x83, 0x40, - 0xfe, 0xe9, 0x68, 0x26, 0x1a, 0x05, 0xc3, 0xd2, 0x1f, 0x12, 0xb2, 0xe1, 0x88, 0xf8, 0x96, 0xb2, - 0x51, 0xe4, 0x16, 0xeb, 0xc1, 0x3b, 0x02, 0xd5, 0xfc, 0x48, 0xd1, 0x3f, 0x96, 0xb7, 0xb7, 0x65, - 0x0f, 0x81, 0xc3, 0x3f, 0x9a, 0xd0, 0x78, 0x7c, 0xfc, 0x95, 0xf9, 0x0a, 0x36, 0x2b, 0x0f, 0x13, - 0x33, 0x5b, 0x2b, 0xcb, 0x5f, 0x4b, 0xe3, 0xb7, 0x56, 0x7d, 0x56, 0x17, 0x87, 0x0d, 0x8e, 0x59, - 0xb9, 0x55, 0x68, 0xcc, 0xe5, 0x77, 0x16, 0x8d, 0xb9, 0xea, 0x32, 0xb2, 0x61, 0x7e, 0x02, 0x2d, - 0xf9, 0xd6, 0x31, 0xaf, 0x29, 0xdd, 0xd2, 0xa3, 0x69, 0xbc, 0x5b, 0x91, 0x6a, 0xc3, 0x23, 0x80, - 0xfc, 0x89, 0x61, 0x8e, 0x94, 0xda, 0xc2, 0x2b, 0x69, 0xbc, 0xbf, 0xe4, 0x8b, 0x06, 0x39, 0x85, - 0xad, 0xea, 0xb3, 0xc1, 0xac, 0xf0, 0x50, 0xbd, 0xe4, 0x8f, 0x6f, 0xae, 0xfc, 0x5e, 0x84, 0xad, - 0x3e, 0x1e, 0x34, 0xec, 0x8a, 0xa7, 0x88, 0x86, 0x5d, 0xf9, 0xea, 0xd8, 0x30, 0xbf, 0x85, 0x61, - 0xf9, 0xde, 0x6f, 0xfe, 0x5f, 0x19, 0x2d, 0x7d, 0x8e, 0x8c, 0x6f, 0xac, 0xf8, 0xaa, 0x01, 0x3f, - 0x94, 0xad, 0x8b, 0x77, 0x8d, 0x8c, 0xe5, 0xc2, 0xa3, 0x60, 0x7c, 0xad, 0x2c, 0xd4, 0x56, 0xf7, - 0xa1, 0x25, 0x6f, 0x90, 0xba, 0x64, 0xa5, 0x0b, 0xe5, 0xb8, 0x5f, 0x94, 0x5a, 0x1b, 0xf7, 0x6b, - 0xb8, 0xa5, 0x3a, 0xcf, 0x08, 0x93, 0xfd, 0x5c, 0x74, 0xb5, 0x60, 0x22, 0x84, 0xdc, 0xe4, 0xac, - 0x25, 0xde, 0xf8, 0x0f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xef, 0x98, 0x5d, 0x0a, 0xf0, 0x0f, - 0x00, 0x00, + // 1433 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xd9, 0x6e, 0x1c, 0x45, + 0x17, 0xf6, 0xcc, 0xf4, 0x6c, 0x67, 0x16, 0xdb, 0xed, 0xd8, 0x19, 0xcf, 0xff, 0x87, 0x24, 0x4d, + 0x80, 0x08, 0x45, 0x56, 0x70, 0x58, 0x42, 0xb8, 0x80, 0xe0, 0x44, 0x09, 0x28, 0x01, 0x2b, 0xb1, + 0x91, 0xb8, 0x61, 0xd4, 0xee, 0x2e, 0x66, 0x8a, 0xe9, 0x8d, 0xee, 0x6a, 0x2f, 0xaf, 0x80, 0x78, + 0x1e, 0x1e, 0x00, 0x89, 0x7b, 0x9e, 0x83, 0xa7, 0xe0, 0xd4, 0xd2, 0xd5, 0xcb, 0x2c, 0x81, 0x0b, + 0x6e, 0x5a, 0xaa, 0xaa, 0x73, 0xbe, 0xf3, 0x9d, 0xb5, 0xab, 0xa0, 0x6b, 0x47, 0xf4, 0x20, 0x8a, + 0x43, 0x16, 0x9a, 0x4d, 0x76, 0x15, 0x91, 0xc4, 0xfa, 0xb5, 0x06, 0x7b, 0x47, 0x31, 0xb1, 0x19, + 0x39, 0x0a, 0x03, 0x66, 0xd3, 0x80, 0xc4, 0xaf, 0xc8, 0xcf, 0x29, 0x49, 0x98, 0x09, 0x50, 0xa7, + 0xee, 0xa8, 0x76, 0xab, 0x76, 0xb7, 0x6b, 0xe2, 0xe2, 0x2c, 0x0d, 0x5c, 0x8f, 0x1c, 0xdb, 0x6c, + 0x36, 0xaa, 0x8b, 0xbd, 0x01, 0x34, 0x13, 0xe6, 0xd2, 0x60, 0xd4, 0x10, 0xcb, 0x21, 0xb4, 0x70, + 0x19, 0xa6, 0x6c, 0x64, 0x14, 0xd6, 0x24, 0x8e, 0x47, 0x4d, 0xb1, 0xde, 0x84, 0xb6, 0x13, 0x06, + 0x49, 0xe8, 0x91, 0x51, 0x2b, 0xc3, 0x74, 0x66, 0xc4, 0x99, 0x47, 0x21, 0x0d, 0xd8, 0xa8, 0xcd, + 0xf7, 0xac, 0x7d, 0xb8, 0xbe, 0xc0, 0x26, 0x89, 0x50, 0x8d, 0x58, 0x0f, 0x61, 0xf0, 0x9a, 0x4e, + 0x03, 0xdb, 0x5b, 0xc6, 0xaf, 0x07, 0x8d, 0x08, 0x17, 0x9c, 0xd8, 0x40, 0x58, 0x16, 0x92, 0x82, + 0xd9, 0xc0, 0xda, 0x82, 0x61, 0xa6, 0xa9, 0xb0, 0x18, 0x6c, 0x3f, 0x76, 0xdd, 0xe3, 0x38, 0x74, + 0x48, 0x92, 0x2c, 0xc3, 0xdb, 0x82, 0x0e, 0x23, 0xb1, 0x4f, 0x39, 0x08, 0x07, 0xed, 0x98, 0xfb, + 0x60, 0xa4, 0x09, 0x89, 0x05, 0x64, 0xef, 0xb0, 0x77, 0x20, 0xc2, 0x77, 0x70, 0x8a, 0x5b, 0x66, + 0x1f, 0x0c, 0x3b, 0x9e, 0x26, 0xe8, 0x77, 0x43, 0x52, 0x21, 0xc1, 0x39, 0x3a, 0xad, 0x16, 0xce, + 0x85, 0x2b, 0x1d, 0x46, 0x0f, 0x0c, 0x21, 0x8f, 0x9b, 0xa9, 0xb2, 0x34, 0xe0, 0x8b, 0xa9, 0x66, + 0xbe, 0x07, 0x43, 0xdb, 0x75, 0x29, 0xa3, 0x21, 0x1a, 0x7e, 0x46, 0xdd, 0x04, 0xcd, 0x35, 0xd0, + 0x83, 0xdb, 0x60, 0x16, 0xf9, 0x4a, 0x2f, 0x32, 0xa7, 0x05, 0x8e, 0xf5, 0x42, 0x47, 0x4e, 0xc7, + 0x74, 0x99, 0x63, 0xef, 0x94, 0x82, 0x5e, 0x17, 0xce, 0x6c, 0x2b, 0x67, 0x72, 0x4d, 0x6b, 0x0c, + 0xa3, 0x45, 0x34, 0x15, 0xbc, 0x07, 0x70, 0xfd, 0x09, 0xf1, 0xc8, 0x9b, 0x2c, 0x61, 0x54, 0x02, + 0xdb, 0x27, 0xb2, 0x58, 0x38, 0xe0, 0xa2, 0x92, 0x02, 0x7c, 0x1b, 0x76, 0x5f, 0xd0, 0x84, 0xad, + 0x85, 0xb3, 0xbe, 0x07, 0xc8, 0x05, 0x34, 0xb8, 0x36, 0x45, 0x2e, 0x29, 0x53, 0x99, 0xc2, 0xb0, + 0x30, 0x27, 0x12, 0x89, 0xea, 0x98, 0x3b, 0xd0, 0x4b, 0x03, 0x7a, 0xf9, 0x3a, 0x74, 0xe6, 0x84, + 0x25, 0xa2, 0x34, 0x3b, 0xa2, 0x72, 0x67, 0xc4, 0xf3, 0x44, 0x65, 0x76, 0xac, 0x2f, 0x60, 0xaf, + 0x6a, 0x5f, 0x45, 0xf8, 0x5d, 0xe8, 0xe5, 0xd1, 0x4a, 0xd0, 0x5a, 0x63, 0x79, 0xb8, 0x86, 0xd0, + 0x7f, 0xcd, 0x30, 0x5a, 0x8a, 0xb8, 0x75, 0x0b, 0x86, 0xba, 0x80, 0xc5, 0x81, 0xec, 0x06, 0x9b, + 0xa5, 0x89, 0x72, 0x67, 0x0e, 0x6d, 0x95, 0xce, 0x52, 0x1a, 0xff, 0x9b, 0xc2, 0xf3, 0xa0, 0xab, + 0xe9, 0xac, 0xce, 0x51, 0xa5, 0xc9, 0x65, 0x57, 0xdf, 0x86, 0x6e, 0x24, 0x79, 0x12, 0x69, 0xa7, + 0x77, 0x38, 0x54, 0x14, 0x32, 0xfe, 0xb9, 0x6b, 0xa2, 0xd1, 0xb1, 0x3e, 0xda, 0x2f, 0x6d, 0x67, + 0x86, 0xc6, 0xaa, 0xb6, 0x9c, 0x08, 0x85, 0x74, 0x8f, 0xfa, 0xc4, 0x0f, 0xe3, 0x2b, 0x61, 0xc7, + 0xb0, 0xbe, 0xc3, 0xee, 0x96, 0x11, 0x54, 0xa1, 0xbf, 0x83, 0x85, 0x9a, 0x71, 0xce, 0x22, 0xbf, + 0x95, 0x45, 0x5e, 0x3b, 0x73, 0x13, 0xda, 0xbe, 0xb4, 0xa5, 0x6a, 0x39, 0x23, 0xa7, 0x18, 0x58, + 0x4f, 0x60, 0xef, 0x34, 0x72, 0xdf, 0x34, 0xde, 0xf2, 0x89, 0x91, 0x4f, 0x10, 0xe9, 0x52, 0x23, + 0x1b, 0x4b, 0x0b, 0x28, 0xaa, 0x78, 0x37, 0x61, 0xf0, 0xf4, 0x9c, 0x60, 0x75, 0x64, 0xb9, 0xff, + 0xb3, 0x06, 0x4d, 0xb1, 0xc3, 0x3d, 0xe6, 0x64, 0x94, 0x0d, 0x69, 0xaf, 0x9e, 0xcf, 0x46, 0x8d, + 0x3f, 0xa8, 0x44, 0xde, 0x28, 0x8e, 0xb4, 0x66, 0x65, 0xa4, 0xb5, 0xc5, 0x1a, 0xfd, 0x56, 0x69, + 0x19, 0x75, 0x4a, 0x7e, 0x67, 0x49, 0x29, 0x87, 0xaf, 0xbb, 0x22, 0x7c, 0xe5, 0x69, 0x00, 0xab, + 0xa6, 0xc1, 0x6f, 0x35, 0xe8, 0x7f, 0x43, 0xd8, 0x45, 0x18, 0xcf, 0x79, 0x92, 0x92, 0x4a, 0xfb, + 0x61, 0xcd, 0xc6, 0x97, 0x93, 0xb3, 0x2b, 0x46, 0x64, 0x76, 0x0d, 0xee, 0x0f, 0xee, 0x1c, 0xdb, + 0xb2, 0xe9, 0x44, 0x86, 0xcd, 0x6d, 0xe8, 0xbe, 0xba, 0x9c, 0xe0, 0xff, 0x20, 0x8c, 0x65, 0x1f, + 0x0a, 0x31, 0xdc, 0x72, 0xe3, 0x30, 0x8a, 0x88, 0xf4, 0xd4, 0xe0, 0x60, 0x27, 0x19, 0x58, 0x2b, + 0x93, 0xc2, 0x9d, 0x48, 0x81, 0xb5, 0x33, 0xb0, 0x13, 0x0d, 0xd6, 0x29, 0x88, 0x65, 0x60, 0x5d, + 0x51, 0x55, 0x3e, 0x74, 0x8e, 0xa2, 0xf4, 0x34, 0xb1, 0xa7, 0x84, 0x4f, 0x02, 0x16, 0x32, 0xdb, + 0x9b, 0xa4, 0x7c, 0x29, 0xa8, 0x1b, 0xe6, 0x35, 0xe8, 0x47, 0x24, 0xc6, 0xba, 0x54, 0xbb, 0x75, + 0x0c, 0x94, 0x61, 0xfe, 0x0f, 0x76, 0xc4, 0x72, 0x42, 0x83, 0xc9, 0x9c, 0xc4, 0x01, 0xf1, 0xfc, + 0xd0, 0x25, 0xca, 0x8f, 0x7d, 0xd8, 0xd6, 0x87, 0xbc, 0x31, 0xc5, 0x91, 0xf0, 0xc7, 0x3a, 0x81, + 0xe1, 0xc9, 0x0c, 0xff, 0xae, 0xcc, 0xa3, 0xc1, 0xf4, 0x89, 0xcd, 0x6c, 0xfe, 0xd3, 0x43, 0x7c, + 0x1a, 0xba, 0x89, 0x32, 0x88, 0xda, 0x4c, 0x8a, 0x10, 0x77, 0x92, 0x1d, 0xc9, 0xa0, 0xe1, 0xf0, + 0xcf, 0x8f, 0x18, 0xf5, 0x95, 0x41, 0xeb, 0x07, 0xe1, 0x84, 0x0c, 0xbc, 0x05, 0xdd, 0x9c, 0x6c, + 0x4d, 0xe4, 0x6b, 0x33, 0xcb, 0x57, 0xe6, 0xe8, 0x01, 0x6c, 0x32, 0xcd, 0x62, 0x82, 0x55, 0x6b, + 0xab, 0xde, 0xd8, 0x55, 0x92, 0x65, 0x8e, 0xd6, 0xe7, 0x00, 0x2f, 0x45, 0x2b, 0x0a, 0xc6, 0x38, + 0x1b, 0x8b, 0x01, 0xc2, 0x40, 0xfb, 0xf6, 0xa5, 0x8e, 0x0e, 0xdf, 0x42, 0x9f, 0x7e, 0xb4, 0xa9, + 0xe7, 0x60, 0xc5, 0x48, 0x82, 0x7f, 0xd5, 0xa0, 0x27, 0x11, 0x24, 0x49, 0x84, 0x70, 0xb0, 0xfd, + 0x32, 0x88, 0x5b, 0x19, 0x62, 0xf9, 0x6f, 0x53, 0xb0, 0x89, 0x65, 0x98, 0x5c, 0xd8, 0x91, 0xb2, + 0xd2, 0x58, 0x25, 0xf6, 0x1e, 0xf4, 0x65, 0x36, 0x94, 0xa0, 0xb1, 0x4a, 0xf0, 0x1e, 0xbf, 0x99, + 0x20, 0x13, 0x31, 0x0b, 0x7b, 0x87, 0x37, 0x4a, 0x12, 0x82, 0xe3, 0x81, 0xf8, 0x3e, 0x0d, 0x58, + 0x7c, 0x35, 0xbe, 0x07, 0x90, 0xaf, 0x78, 0xdb, 0xcd, 0xc9, 0x95, 0xaa, 0x6c, 0xf4, 0xe4, 0xdc, + 0xf6, 0x52, 0xe5, 0xf9, 0xa3, 0xfa, 0xc3, 0x9a, 0xf5, 0x35, 0x6c, 0x7e, 0xe9, 0xcd, 0x69, 0x58, + 0x50, 0x41, 0x29, 0xdf, 0xfe, 0x29, 0x8c, 0x95, 0xbf, 0x7c, 0x49, 0x03, 0x5c, 0xca, 0x70, 0x61, + 0xdf, 0x87, 0x91, 0x9a, 0xa6, 0x1a, 0x4f, 0xd6, 0xcb, 0xef, 0x0d, 0x80, 0x1c, 0xcc, 0x7c, 0x04, + 0x63, 0x1a, 0x4e, 0xb0, 0xa4, 0xce, 0xa9, 0x43, 0x64, 0x0b, 0x4c, 0x62, 0xe2, 0xa4, 0x71, 0x42, + 0xcf, 0x89, 0x1a, 0x81, 0x7b, 0xca, 0x97, 0x2a, 0x87, 0x8f, 0x60, 0x37, 0xd7, 0x75, 0x0b, 0x6a, + 0xf5, 0xb5, 0x6a, 0x0f, 0x60, 0x07, 0xd5, 0x70, 0x70, 0xa5, 0x25, 0xa5, 0xc6, 0x5a, 0xa5, 0x4f, + 0x61, 0xbf, 0xc0, 0x93, 0x57, 0x6a, 0x41, 0xd5, 0x58, 0xab, 0xfa, 0x31, 0xec, 0xa1, 0xea, 0x85, + 0x4d, 0x59, 0x55, 0xaf, 0xf9, 0x0f, 0x78, 0xfa, 0x24, 0x9e, 0x96, 0x78, 0xb6, 0xd6, 0x2a, 0x7d, + 0x00, 0xdb, 0xa8, 0x54, 0xb1, 0xd3, 0x7e, 0x93, 0x4a, 0x42, 0x1c, 0x86, 0x53, 0xa5, 0xa0, 0xd2, + 0x59, 0xa7, 0x62, 0x3d, 0x86, 0xfe, 0xf3, 0x74, 0x4a, 0x98, 0x77, 0xa6, 0xab, 0xff, 0xdf, 0x36, + 0xd0, 0x2f, 0x75, 0xe8, 0x1d, 0x4d, 0xe3, 0x30, 0x8d, 0x4a, 0x5d, 0x2e, 0x6b, 0x78, 0xa1, 0xcb, + 0xa5, 0xcc, 0x5d, 0xe8, 0xcb, 0x1f, 0xa8, 0x12, 0x93, 0xcd, 0x65, 0x2e, 0x96, 0x3a, 0xbf, 0xc4, + 0x9c, 0x71, 0xce, 0x4a, 0xb0, 0xdc, 0x5e, 0x85, 0xf2, 0xfb, 0x0c, 0x06, 0x33, 0xe9, 0x88, 0x92, + 0x94, 0xa9, 0xbc, 0x93, 0x59, 0xce, 0x09, 0x1e, 0x14, 0x1d, 0x96, 0x4d, 0xf4, 0x1c, 0xb6, 0x17, + 0x36, 0xcb, 0xbd, 0x64, 0x15, 0x7b, 0xa9, 0x77, 0xb8, 0xa3, 0x60, 0x8b, 0x5a, 0xa2, 0xc1, 0x22, + 0x68, 0x4a, 0x3e, 0xef, 0xc3, 0x20, 0x90, 0x3f, 0x1d, 0x1d, 0x89, 0x46, 0x41, 0xb1, 0xf4, 0x43, + 0xc2, 0x68, 0x38, 0x82, 0xdf, 0xd2, 0x68, 0x14, 0x63, 0x8b, 0xf9, 0xe0, 0x15, 0x81, 0x62, 0x7e, + 0xa4, 0xc2, 0x3f, 0x96, 0xb7, 0xb7, 0x65, 0x0f, 0x81, 0xc3, 0x3f, 0x9a, 0xd0, 0x78, 0x7c, 0xfc, + 0x95, 0xf9, 0x0a, 0x36, 0x2b, 0x0f, 0x13, 0x33, 0x1b, 0x2b, 0xcb, 0x9f, 0x4f, 0xe3, 0xb7, 0x56, + 0x1d, 0xab, 0x8b, 0xc3, 0x06, 0xc7, 0xac, 0xdc, 0x2a, 0x34, 0xe6, 0xf2, 0x3b, 0x8b, 0xc6, 0x5c, + 0x75, 0x19, 0xd9, 0x30, 0x3f, 0x81, 0x96, 0x7c, 0xeb, 0x98, 0xd7, 0x94, 0x6c, 0xe9, 0xd1, 0x34, + 0xde, 0xad, 0xec, 0x6a, 0xc5, 0x23, 0x80, 0xfc, 0x89, 0x61, 0x8e, 0x94, 0xd8, 0xc2, 0x2b, 0x69, + 0xbc, 0xbf, 0xe4, 0x44, 0x83, 0x9c, 0xc2, 0x56, 0xf5, 0xd9, 0x60, 0x56, 0xe2, 0x50, 0xbd, 0xe4, + 0x8f, 0x6f, 0xae, 0x3c, 0x2f, 0xc2, 0x56, 0x1f, 0x0f, 0x1a, 0x76, 0xc5, 0x53, 0x44, 0xc3, 0xae, + 0x7c, 0x75, 0x6c, 0x98, 0xdf, 0xc2, 0xb0, 0x7c, 0xef, 0x37, 0xff, 0xaf, 0x94, 0x96, 0x3e, 0x47, + 0xc6, 0x37, 0x56, 0x9c, 0x6a, 0xc0, 0x0f, 0x65, 0xe9, 0xe2, 0x5d, 0x23, 0x8b, 0x72, 0xe1, 0x51, + 0x30, 0xbe, 0x56, 0xde, 0xd4, 0x5a, 0xf7, 0xa1, 0x25, 0x6f, 0x90, 0x3a, 0x65, 0xa5, 0x0b, 0xe5, + 0xb8, 0x5f, 0xdc, 0xb5, 0x36, 0xee, 0xd7, 0x70, 0x4a, 0x75, 0x9e, 0x11, 0x26, 0xeb, 0xb9, 0x68, + 0x6a, 0x41, 0x45, 0x6c, 0x72, 0x95, 0xb3, 0x96, 0x78, 0xf5, 0x3f, 0xf8, 0x3b, 0x00, 0x00, 0xff, + 0xff, 0xa7, 0x4a, 0xd4, 0x7d, 0x02, 0x10, 0x00, 0x00, } diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto index b69e1b5..680b745 100644 --- a/api/grpc/types/api.proto +++ b/api/grpc/types/api.proto @@ -21,6 +21,7 @@ message CreateContainerRequest { string stdin = 3; // path to the file where stdin will be read (optional) string stdout = 4; // path to file where stdout will be written (optional) string stderr = 5; // path to file where stderr will be written (optional) + string console = 6; // path to the console for a container (optional) string checkpoint = 7; // checkpoint name if you want to create immediate checkpoint (optional) } From d542ece69c7e7bd080075f25b4d26f8673cd66cc Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 14 Dec 2015 16:47:42 -0800 Subject: [PATCH 2/2] Add tty support from client Signed-off-by: Michael Crosby --- api/grpc/server/server.go | 1 + ctr/container.go | 57 ++++++++++++++++++++++++++++++++++++--- event.go | 1 + io.go | 6 +++-- linux/linux.go | 21 ++++++++++----- runc/runc.go | 2 +- runtime/container.go | 8 +++--- runtime/runtime.go | 2 +- start.go | 2 +- 9 files changed, 80 insertions(+), 20 deletions(-) diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go index 7b9bb57..6e105cc 100644 --- a/api/grpc/server/server.go +++ b/api/grpc/server/server.go @@ -36,6 +36,7 @@ func (s *apiServer) CreateContainer(ctx context.Context, c *types.CreateContaine e.Stdout = c.Stdout e.Stderr = c.Stderr e.Stdin = c.Stdin + e.Console = c.Console if c.Checkpoint != "" { e.Checkpoint = &runtime.Checkpoint{ Name: c.Checkpoint, diff --git a/ctr/container.go b/ctr/container.go index 900e707..efd06cb 100644 --- a/ctr/container.go +++ b/ctr/container.go @@ -11,6 +11,8 @@ import ( "github.com/codegangsta/cli" "github.com/docker/containerd/api/grpc/types" + "github.com/docker/docker/pkg/term" + "github.com/opencontainers/runc/libcontainer" netcontext "golang.org/x/net/context" "google.golang.org/grpc" ) @@ -72,6 +74,10 @@ var StartCommand = cli.Command{ Name: "interactive,i", Usage: "connect to the stdio of the container", }, + cli.BoolFlag{ + Name: "tty,t", + Usage: "allocate a tty for use with the container", + }, }, Action: func(context *cli.Context) { var ( @@ -84,6 +90,11 @@ var StartCommand = cli.Command{ if id == "" { fatal("container id cannot be empty", 1) } + c := getClient() + events, err := c.Events(netcontext.Background(), &types.EventsRequest{}) + if err != nil { + fatal(err.Error(), 1) + } r := &types.CreateContainerRequest{ Id: id, BundlePath: path, @@ -94,17 +105,57 @@ var StartCommand = cli.Command{ fatal(err.Error(), 1) } } - c := getClient() + if context.Bool("tty") { + if err := attachTty(r); err != nil { + fatal(err.Error(), 1) + } + } if _, err := c.CreateContainer(netcontext.Background(), r); err != nil { fatal(err.Error(), 1) } if stdin != nil { - io.Copy(stdin, os.Stdin) + go func() { + io.Copy(stdin, os.Stdin) + if state != nil { + term.RestoreTerminal(os.Stdin.Fd(), state) + } + }() + for { + e, err := events.Recv() + if err != nil { + fatal(err.Error(), 1) + } + if e.Id == id && e.Type == "exit" { + os.Exit(int(e.Status)) + } + } } }, } -var stdin io.WriteCloser +var ( + stdin io.WriteCloser + state *term.State +) + +func attachTty(r *types.CreateContainerRequest) error { + console, err := libcontainer.NewConsole(os.Getuid(), os.Getgid()) + if err != nil { + return err + } + r.Console = console.Path() + stdin = console + go func() { + io.Copy(os.Stdout, console) + console.Close() + }() + s, err := term.SetRawTerminal(os.Stdin.Fd()) + if err != nil { + return err + } + state = s + return nil +} func attachStdio(r *types.CreateContainerRequest) error { dir, err := ioutil.TempDir("", "ctr-") diff --git a/event.go b/event.go index 632fa1a..f316ff3 100644 --- a/event.go +++ b/event.go @@ -41,6 +41,7 @@ type Event struct { Stdout string Stderr string Stdin string + Console string Pid int Status int Signal os.Signal diff --git a/io.go b/io.go index 0c4a0d0..8162807 100644 --- a/io.go +++ b/io.go @@ -53,8 +53,10 @@ type copier struct { func (l *copier) Close() (err error) { for _, c := range append(l.closers, l.config.Stdin, l.config.Stdout, l.config.Stderr) { - if cerr := c.Close(); err == nil { - err = cerr + if c != nil { + if cerr := c.Close(); err == nil { + err = cerr + } } } return err diff --git a/linux/linux.go b/linux/linux.go index a3a94b6..1ea8b6d 100644 --- a/linux/linux.go +++ b/linux/linux.go @@ -188,9 +188,18 @@ func (p *libcontainerProcess) Signal(s os.Signal) error { func (p *libcontainerProcess) Close() error { // in close we always need to call wait to close/flush any pipes _, err := p.process.Wait() - p.process.Stdin.(io.Closer).Close() - p.process.Stdout.(io.Closer).Close() - p.process.Stderr.(io.Closer).Close() + // explicitly close any open fd on the process + for _, cl := range []interface{}{ + p.process.Stderr, + p.process.Stdout, + p.process.Stdin, + } { + if cl != nil { + if c, ok := cl.(io.Closer); ok { + c.Close() + } + } + } return err } @@ -375,7 +384,7 @@ func (r *libcontainerRuntime) Type() string { return "libcontainer" } -func (r *libcontainerRuntime) Create(id, bundlePath string) (runtime.Container, *runtime.IO, error) { +func (r *libcontainerRuntime) Create(id, bundlePath, consolePath string) (runtime.Container, *runtime.IO, error) { spec, rspec, err := r.loadSpec( filepath.Join(bundlePath, "config.json"), filepath.Join(bundlePath, "runtime.json"), @@ -397,11 +406,9 @@ func (r *libcontainerRuntime) Create(id, bundlePath string) (runtime.Container, } var rio runtime.IO if spec.Process.Terminal { - console, err := process.NewConsole(int(spec.Process.User.UID)) - if err != nil { + if err := process.ConsoleFromPath(consolePath); err != nil { return nil, nil, err } - rio.Console = console } else { i, err := process.InitializeIO(int(spec.Process.User.UID)) if err != nil { diff --git a/runc/runc.go b/runc/runc.go index 9de6a4e..a2bd77b 100644 --- a/runc/runc.go +++ b/runc/runc.go @@ -147,7 +147,7 @@ func (r *runcRuntime) Type() string { return "runc" } -func (r *runcRuntime) Create(id, bundlePath string) (runtime.Container, *runtime.IO, error) { +func (r *runcRuntime) Create(id, bundlePath, consolePath string) (runtime.Container, *runtime.IO, error) { var s specs.Spec f, err := os.Open(filepath.Join(bundlePath, "config.json")) if err != nil { diff --git a/runtime/container.go b/runtime/container.go index 16d5283..d2e5e5e 100644 --- a/runtime/container.go +++ b/runtime/container.go @@ -32,10 +32,9 @@ type Console interface { } type IO struct { - Stdin io.WriteCloser - Stdout io.ReadCloser - Stderr io.ReadCloser - Console Console + Stdin io.WriteCloser + Stdout io.ReadCloser + Stderr io.ReadCloser } func (i *IO) Close() error { @@ -44,7 +43,6 @@ func (i *IO) Close() error { i.Stdin, i.Stdout, i.Stderr, - i.Console, } { if c != nil { if err := c.Close(); oerr == nil { diff --git a/runtime/runtime.go b/runtime/runtime.go index aabe055..500067d 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -20,7 +20,7 @@ type Runtime interface { // Type of the runtime Type() string // Create creates a new container initialized but without it starting it - Create(id, bundlePath string) (Container, *IO, error) + Create(id, bundlePath, consolePath string) (Container, *IO, error) // StartProcess adds a new process to the container StartProcess(Container, specs.Process) (Process, *IO, error) } diff --git a/start.go b/start.go index 1f9ec8b..8bf6775 100644 --- a/start.go +++ b/start.go @@ -5,7 +5,7 @@ type StartEvent struct { } func (h *StartEvent) Handle(e *Event) error { - container, io, err := h.s.runtime.Create(e.ID, e.BundlePath) + container, io, err := h.s.runtime.Create(e.ID, e.BundlePath, e.Console) if err != nil { return err }