diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go index c541ab3d4d..5bf94f1e27 100644 --- a/agent/exec/dockerapi/container.go +++ b/agent/exec/dockerapi/container.go @@ -209,6 +209,7 @@ func (c *containerConfig) hostConfig() *enginecontainer.HostConfig { PortBindings: c.portBindings(), Init: c.init(), Isolation: c.isolation(), + Capabilities: c.spec().Capabilities, } // The format of extra hosts on swarmkit is specified in: diff --git a/api/api.pb.txt b/api/api.pb.txt index a746734c73..ce4f150ccd 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -4919,6 +4919,13 @@ file { type_name: ".google.protobuf.Int64Value" json_name: "memorySwappiness" } + field { + name: "capabilities" + number: 29 + label: LABEL_REPEATED + type: TYPE_STRING + json_name: "capabilities" + } nested_type { name: "LabelsEntry" field { diff --git a/api/specs.pb.go b/api/specs.pb.go index 3adb9129b0..7ce0be189a 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -642,6 +642,8 @@ type ContainerSpec struct { // to the container OS's default - generally 60, or the value predefined in // the image; set to -1 to unset a previously set value MemorySwappiness *google_protobuf4.Int64Value `protobuf:"bytes,28,opt,name=memory_swappiness,json=memorySwappiness" json:"memory_swappiness,omitempty"` + // Capabilities is the list of Linux capabilities to be available for container (this overrides the default set of capabilities) + Capabilities []string `protobuf:"bytes,29,rep,name=capabilities" json:"capabilities,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } @@ -1207,6 +1209,11 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { m.MemorySwappiness = &google_protobuf4.Int64Value{} deepcopy.Copy(m.MemorySwappiness, o.MemorySwappiness) } + if o.Capabilities != nil { + m.Capabilities = make([]string, len(o.Capabilities)) + copy(m.Capabilities, o.Capabilities) + } + } func (m *ContainerSpec_PullOptions) Copy() *ContainerSpec_PullOptions { @@ -2133,6 +2140,23 @@ func (m *ContainerSpec) MarshalTo(dAtA []byte) (int, error) { } i += n25 } + if len(m.Capabilities) > 0 { + for _, s := range m.Capabilities { + dAtA[i] = 0xea + i++ + dAtA[i] = 0x1 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } return i, nil } @@ -2865,6 +2889,12 @@ func (m *ContainerSpec) Size() (n int) { l = m.MemorySwappiness.Size() n += 2 + l + sovSpecs(uint64(l)) } + if len(m.Capabilities) > 0 { + for _, s := range m.Capabilities { + l = len(s) + n += 2 + l + sovSpecs(uint64(l)) + } + } return n } @@ -3226,6 +3256,7 @@ func (this *ContainerSpec) String() string { `Sysctls:` + mapStringForSysctls + `,`, `MemorySwap:` + fmt.Sprintf("%v", this.MemorySwap) + `,`, `MemorySwappiness:` + strings.Replace(fmt.Sprintf("%v", this.MemorySwappiness), "Int64Value", "google_protobuf4.Int64Value", 1) + `,`, + `Capabilities:` + fmt.Sprintf("%v", this.Capabilities) + `,`, `}`, }, "") return s @@ -5544,6 +5575,35 @@ func (m *ContainerSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 29: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Capabilities", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthSpecs + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Capabilities = append(m.Capabilities, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipSpecs(dAtA[iNdEx:]) @@ -6855,144 +6915,145 @@ var ( func init() { proto.RegisterFile("github.com/docker/swarmkit/api/specs.proto", fileDescriptorSpecs) } var fileDescriptorSpecs = []byte{ - // 2213 bytes of a gzipped FileDescriptorProto + // 2229 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xb9, - 0xf5, 0xb7, 0x6c, 0x59, 0x3f, 0xde, 0xc8, 0x89, 0xcc, 0xcd, 0xee, 0x8e, 0x95, 0xac, 0xad, 0xd5, - 0x66, 0xf3, 0xf5, 0xee, 0xe2, 0x2b, 0xa3, 0x6e, 0x90, 0x66, 0x93, 0x6e, 0x5b, 0xc9, 0xd2, 0xda, - 0x6a, 0x12, 0x5b, 0xa0, 0x1c, 0xb7, 0x01, 0x0a, 0x08, 0xf4, 0x0c, 0x2d, 0x0d, 0x3c, 0x1a, 0x4e, - 0x49, 0xca, 0x81, 0x6e, 0x3d, 0x2e, 0xdc, 0xbf, 0xc1, 0xe8, 0xa1, 0xe8, 0xbd, 0xfd, 0x2f, 0x72, - 0x6c, 0x6f, 0xed, 0xc5, 0xe8, 0xfa, 0x5f, 0xe8, 0xad, 0x97, 0x16, 0xe4, 0x70, 0xa4, 0x91, 0x2d, - 0xc7, 0x29, 0x9a, 0x43, 0x6f, 0xe4, 0x9b, 0xcf, 0xe7, 0x91, 0x7c, 0xfc, 0xf0, 0xf1, 0x71, 0xe0, - 0xcb, 0x9e, 0x27, 0xfb, 0xc3, 0xc3, 0xaa, 0xc3, 0x06, 0x1b, 0x2e, 0x73, 0x8e, 0x29, 0xdf, 0x10, - 0xaf, 0x09, 0x1f, 0x1c, 0x7b, 0x72, 0x83, 0x84, 0xde, 0x86, 0x08, 0xa9, 0x23, 0xaa, 0x21, 0x67, - 0x92, 0x21, 0x14, 0x01, 0xaa, 0x31, 0xa0, 0x7a, 0xf2, 0x83, 0xd2, 0x4d, 0x7c, 0x39, 0x0a, 0xa9, - 0xe1, 0x97, 0xee, 0xf4, 0x58, 0x8f, 0xe9, 0xe6, 0x86, 0x6a, 0x19, 0xeb, 0x6a, 0x8f, 0xb1, 0x9e, - 0x4f, 0x37, 0x74, 0xef, 0x70, 0x78, 0xb4, 0xe1, 0x0e, 0x39, 0x91, 0x1e, 0x0b, 0xcc, 0xf7, 0x95, - 0xcb, 0xdf, 0x49, 0x30, 0xba, 0x8e, 0xfa, 0x9a, 0x93, 0x30, 0xa4, 0xdc, 0x0c, 0x58, 0x39, 0x4b, - 0x43, 0x6e, 0x97, 0xb9, 0xb4, 0x13, 0x52, 0x07, 0x6d, 0x83, 0x45, 0x82, 0x80, 0x49, 0xed, 0x5b, - 0xd8, 0xa9, 0x72, 0x6a, 0xdd, 0xda, 0x5c, 0xab, 0x5e, 0x5d, 0x53, 0xb5, 0x36, 0x81, 0xd5, 0xd3, - 0x6f, 0xce, 0xd7, 0xe6, 0x70, 0x92, 0x89, 0x7e, 0x0a, 0x05, 0x97, 0x0a, 0x8f, 0x53, 0xb7, 0xcb, - 0x99, 0x4f, 0xed, 0xf9, 0x72, 0x6a, 0xfd, 0xd6, 0xe6, 0xbd, 0x59, 0x9e, 0xd4, 0xe0, 0x98, 0xf9, - 0x14, 0x5b, 0x86, 0xa1, 0x3a, 0x68, 0x1b, 0x60, 0x40, 0x07, 0x87, 0x94, 0x8b, 0xbe, 0x17, 0xda, - 0x0b, 0x9a, 0xfe, 0x7f, 0xd7, 0xd1, 0xd5, 0xdc, 0xab, 0x2f, 0xc6, 0x70, 0x9c, 0xa0, 0xa2, 0x17, - 0x50, 0x20, 0x27, 0xc4, 0xf3, 0xc9, 0xa1, 0xe7, 0x7b, 0x72, 0x64, 0xa7, 0xb5, 0xab, 0x2f, 0xde, + 0xf5, 0xb7, 0x6c, 0x59, 0x3f, 0xde, 0xc8, 0x89, 0xcc, 0xcd, 0xee, 0x8e, 0x95, 0xc4, 0xd6, 0x6a, + 0x77, 0xf3, 0xf5, 0xee, 0xe2, 0x2b, 0xa3, 0x6e, 0x90, 0x66, 0x93, 0x6e, 0x5b, 0xc9, 0xd2, 0xda, + 0x6a, 0x12, 0x5b, 0xa0, 0x1c, 0xb7, 0x01, 0x0a, 0x08, 0xf4, 0x0c, 0x2d, 0x11, 0x1e, 0x0d, 0xa7, + 0x1c, 0xca, 0x81, 0x6e, 0x3d, 0x2e, 0xdc, 0xbf, 0xc1, 0xe8, 0xa1, 0xe8, 0xbd, 0xfd, 0x2f, 0x72, + 0xec, 0xb1, 0xbd, 0x18, 0x5d, 0xff, 0x0b, 0x45, 0x2f, 0xbd, 0xb4, 0x20, 0x87, 0x23, 0x8d, 0x6c, + 0x39, 0x4e, 0xd1, 0x1c, 0x7a, 0x23, 0xdf, 0x7c, 0x3e, 0x8f, 0xe4, 0xe3, 0x87, 0x8f, 0x8f, 0x03, + 0x5f, 0xf6, 0x98, 0xec, 0x0f, 0x0f, 0xab, 0x0e, 0x1f, 0x6c, 0xb8, 0xdc, 0x39, 0xa6, 0x62, 0x23, + 0x7c, 0x4d, 0xc4, 0xe0, 0x98, 0xc9, 0x0d, 0x12, 0xb0, 0x8d, 0x30, 0xa0, 0x4e, 0x58, 0x0d, 0x04, + 0x97, 0x1c, 0xa1, 0x08, 0x50, 0x8d, 0x01, 0xd5, 0x93, 0x1f, 0x94, 0x6e, 0xe2, 0xcb, 0x51, 0x40, + 0x0d, 0xbf, 0x74, 0xa7, 0xc7, 0x7b, 0x5c, 0x37, 0x37, 0x54, 0xcb, 0x58, 0x57, 0x7b, 0x9c, 0xf7, + 0x3c, 0xba, 0xa1, 0x7b, 0x87, 0xc3, 0xa3, 0x0d, 0x77, 0x28, 0x88, 0x64, 0xdc, 0x37, 0xdf, 0x57, + 0x2e, 0x7f, 0x27, 0xfe, 0xe8, 0x3a, 0xea, 0x6b, 0x41, 0x82, 0x80, 0x0a, 0x33, 0x60, 0xe5, 0x2c, + 0x0d, 0xb9, 0x5d, 0xee, 0xd2, 0x4e, 0x40, 0x1d, 0xb4, 0x0d, 0x16, 0xf1, 0x7d, 0x2e, 0xb5, 0xef, + 0xd0, 0x4e, 0x95, 0x53, 0xeb, 0xd6, 0xe6, 0x5a, 0xf5, 0xea, 0x9a, 0xaa, 0xb5, 0x09, 0xac, 0x9e, + 0x7e, 0x73, 0xbe, 0x36, 0x87, 0x93, 0x4c, 0xf4, 0x53, 0x28, 0xb8, 0x34, 0x64, 0x82, 0xba, 0x5d, + 0xc1, 0x3d, 0x6a, 0xcf, 0x97, 0x53, 0xeb, 0xb7, 0x36, 0xef, 0xcd, 0xf2, 0xa4, 0x06, 0xc7, 0xdc, + 0xa3, 0xd8, 0x32, 0x0c, 0xd5, 0x41, 0xdb, 0x00, 0x03, 0x3a, 0x38, 0xa4, 0x22, 0xec, 0xb3, 0xc0, + 0x5e, 0xd0, 0xf4, 0xff, 0xbb, 0x8e, 0xae, 0xe6, 0x5e, 0x7d, 0x31, 0x86, 0xe3, 0x04, 0x15, 0xbd, + 0x80, 0x02, 0x39, 0x21, 0xcc, 0x23, 0x87, 0xcc, 0x63, 0x72, 0x64, 0xa7, 0xb5, 0xab, 0x2f, 0xde, 0xea, 0xaa, 0x96, 0x20, 0xe0, 0x29, 0x7a, 0xc5, 0x05, 0x98, 0x0c, 0x84, 0x1e, 0x40, 0xb6, 0xdd, 0xdc, 0x6d, 0xb4, 0x76, 0xb7, 0x8b, 0x73, 0xa5, 0x95, 0xd3, 0xb3, 0xf2, 0x87, 0xca, 0xc7, 0x04, - 0xd0, 0xa6, 0x81, 0xeb, 0x05, 0x3d, 0xb4, 0x0e, 0xb9, 0xda, 0xd6, 0x56, 0xb3, 0xbd, 0xdf, 0x6c, - 0x14, 0x53, 0xa5, 0xd2, 0xe9, 0x59, 0xf9, 0xa3, 0x69, 0x60, 0xcd, 0x71, 0x68, 0x28, 0xa9, 0x5b, - 0x4a, 0x7f, 0xf7, 0xfb, 0xd5, 0xb9, 0xca, 0x77, 0x29, 0x28, 0x24, 0x27, 0x81, 0x1e, 0x40, 0xa6, - 0xb6, 0xb5, 0xdf, 0x3a, 0x68, 0x16, 0xe7, 0x26, 0xf4, 0x24, 0xa2, 0xe6, 0x48, 0xef, 0x84, 0xa2, - 0xfb, 0xb0, 0xd8, 0xae, 0xbd, 0xec, 0x34, 0x8b, 0xa9, 0xc9, 0x74, 0x92, 0xb0, 0x36, 0x19, 0x0a, - 0x8d, 0x6a, 0xe0, 0x5a, 0x6b, 0xb7, 0x38, 0x3f, 0x1b, 0xd5, 0xe0, 0xc4, 0x0b, 0xcc, 0x54, 0x7e, - 0x97, 0x06, 0xab, 0x43, 0xf9, 0x89, 0xe7, 0xbc, 0x67, 0x89, 0x3c, 0x82, 0xb4, 0x24, 0xe2, 0x58, - 0x4b, 0xc3, 0x9a, 0x2d, 0x8d, 0x7d, 0x22, 0x8e, 0xd5, 0xa0, 0x86, 0xae, 0xf1, 0x4a, 0x19, 0x9c, - 0x86, 0xbe, 0xe7, 0x10, 0x49, 0x5d, 0xad, 0x0c, 0x6b, 0xf3, 0xf3, 0x59, 0x6c, 0x3c, 0x46, 0x99, - 0xf9, 0xef, 0xcc, 0xe1, 0x04, 0x15, 0x3d, 0x85, 0x4c, 0xcf, 0x67, 0x87, 0xc4, 0xd7, 0x9a, 0xb0, - 0x36, 0x3f, 0x9d, 0xe5, 0x64, 0x5b, 0x23, 0x26, 0x0e, 0x0c, 0x05, 0x3d, 0x86, 0xcc, 0x30, 0x74, - 0x89, 0xa4, 0x76, 0x46, 0x93, 0xcb, 0xb3, 0xc8, 0x2f, 0x35, 0x62, 0x8b, 0x05, 0x47, 0x5e, 0x0f, - 0x1b, 0x3c, 0x7a, 0x06, 0xb9, 0x80, 0xca, 0xd7, 0x8c, 0x1f, 0x0b, 0x3b, 0x5b, 0x5e, 0x58, 0xb7, - 0x36, 0xbf, 0x9a, 0x29, 0xc6, 0x08, 0x53, 0x93, 0x92, 0x38, 0xfd, 0x01, 0x0d, 0x64, 0xe4, 0xa6, - 0x3e, 0x6f, 0xa7, 0xf0, 0xd8, 0x01, 0xfa, 0x31, 0xe4, 0x68, 0xe0, 0x86, 0xcc, 0x0b, 0xa4, 0x9d, - 0xbb, 0x7e, 0x22, 0x4d, 0x83, 0x51, 0xc1, 0xc4, 0x63, 0x86, 0x62, 0x73, 0xe6, 0xfb, 0x87, 0xc4, - 0x39, 0xb6, 0xf3, 0xef, 0xb8, 0x8c, 0x31, 0xa3, 0x9e, 0x81, 0xf4, 0x80, 0xb9, 0xb4, 0xb2, 0x01, - 0xcb, 0x57, 0x42, 0x8d, 0x4a, 0x90, 0x33, 0xa1, 0x8e, 0x34, 0x92, 0xc6, 0xe3, 0x7e, 0xe5, 0x36, - 0x2c, 0x4d, 0x85, 0xb5, 0xf2, 0xc7, 0x45, 0xc8, 0xc5, 0x7b, 0x8d, 0x6a, 0x90, 0x77, 0x58, 0x20, - 0x89, 0x17, 0x50, 0x6e, 0xe4, 0x35, 0x73, 0x67, 0xb6, 0x62, 0x90, 0x62, 0xed, 0xcc, 0xe1, 0x09, - 0x0b, 0x7d, 0x0b, 0x79, 0x4e, 0x05, 0x1b, 0x72, 0x87, 0x0a, 0xa3, 0xaf, 0xf5, 0xd9, 0x0a, 0x89, - 0x40, 0x98, 0xfe, 0x7a, 0xe8, 0x71, 0xaa, 0xa2, 0x2c, 0xf0, 0x84, 0x8a, 0x9e, 0x42, 0x96, 0x53, - 0x21, 0x09, 0x97, 0x6f, 0x93, 0x08, 0x8e, 0x20, 0x6d, 0xe6, 0x7b, 0xce, 0x08, 0xc7, 0x0c, 0xf4, - 0x14, 0xf2, 0xa1, 0x4f, 0x1c, 0xed, 0xd5, 0x5e, 0xd4, 0xf4, 0x4f, 0x66, 0xd1, 0xdb, 0x31, 0x08, - 0x4f, 0xf0, 0xe8, 0x6b, 0x00, 0x9f, 0xf5, 0xba, 0x2e, 0xf7, 0x4e, 0x28, 0x37, 0x12, 0x2b, 0xcd, - 0x62, 0x37, 0x34, 0x02, 0xe7, 0x7d, 0xd6, 0x8b, 0x9a, 0x68, 0xfb, 0xbf, 0xd2, 0x57, 0x42, 0x5b, - 0xcf, 0x00, 0xc8, 0xf8, 0xab, 0x51, 0xd7, 0x17, 0xef, 0xe4, 0xca, 0xec, 0x48, 0x82, 0x8e, 0x3e, - 0x85, 0xc2, 0x11, 0xe3, 0x0e, 0xed, 0x9a, 0x53, 0x93, 0xd7, 0x9a, 0xb0, 0xb4, 0x2d, 0xd2, 0x17, - 0xaa, 0x43, 0xb6, 0x47, 0x03, 0xca, 0x3d, 0xc7, 0x06, 0x3d, 0xd8, 0x83, 0x99, 0x07, 0x32, 0x82, - 0xe0, 0x61, 0x20, 0xbd, 0x01, 0x35, 0x23, 0xc5, 0x44, 0xf4, 0x2b, 0xf8, 0x20, 0xde, 0xbe, 0x2e, - 0xa7, 0x47, 0x94, 0xd3, 0x40, 0x69, 0xc0, 0xd2, 0x71, 0xf8, 0xfc, 0xed, 0x1a, 0x30, 0x68, 0x93, - 0x6c, 0x10, 0xbf, 0xfc, 0x41, 0xd4, 0xf3, 0x90, 0xe5, 0xd1, 0xb8, 0x95, 0xdf, 0xa6, 0x94, 0xea, - 0x2f, 0x21, 0xd0, 0x06, 0x58, 0xe3, 0xe1, 0x3d, 0x57, 0xab, 0x37, 0x5f, 0xbf, 0x75, 0x71, 0xbe, - 0x06, 0x31, 0xb6, 0xd5, 0x50, 0x39, 0xc8, 0xb4, 0x5d, 0xd4, 0x84, 0xa5, 0x31, 0x41, 0x95, 0x01, - 0xe6, 0xa2, 0x2c, 0xbf, 0x6d, 0xa6, 0xfb, 0xa3, 0x90, 0xe2, 0x02, 0x4f, 0xf4, 0x2a, 0xbf, 0x04, - 0x74, 0x35, 0x2e, 0x08, 0x41, 0xfa, 0xd8, 0x0b, 0xcc, 0x34, 0xb0, 0x6e, 0xa3, 0x2a, 0x64, 0x43, - 0x32, 0xf2, 0x19, 0x71, 0xcd, 0xc1, 0xb8, 0x53, 0x8d, 0x0a, 0x84, 0x6a, 0x5c, 0x20, 0x54, 0x6b, - 0xc1, 0x08, 0xc7, 0xa0, 0xca, 0x33, 0xf8, 0x70, 0xe6, 0xf6, 0xa2, 0x4d, 0x28, 0x8c, 0x0f, 0xdc, - 0x64, 0xad, 0xb7, 0x2f, 0xce, 0xd7, 0xac, 0xf1, 0xc9, 0x6c, 0x35, 0xb0, 0x35, 0x06, 0xb5, 0xdc, - 0xca, 0x5f, 0x96, 0x60, 0x69, 0xea, 0xd8, 0xa2, 0x3b, 0xb0, 0xe8, 0x0d, 0x48, 0x8f, 0x9a, 0x39, - 0x46, 0x1d, 0xd4, 0x84, 0x8c, 0x4f, 0x0e, 0xa9, 0xaf, 0x0e, 0xaf, 0xda, 0xb8, 0xff, 0xbf, 0xf1, - 0xfc, 0x57, 0x9f, 0x6b, 0x7c, 0x33, 0x90, 0x7c, 0x84, 0x0d, 0x19, 0xd9, 0x90, 0x75, 0xd8, 0x60, - 0x40, 0x02, 0x75, 0x4d, 0x2c, 0xac, 0xe7, 0x71, 0xdc, 0x55, 0x91, 0x21, 0xbc, 0x27, 0xec, 0xb4, - 0x36, 0xeb, 0x36, 0x2a, 0xc2, 0x02, 0x0d, 0x4e, 0xec, 0x45, 0x6d, 0x52, 0x4d, 0x65, 0x71, 0xbd, - 0xe8, 0xf4, 0xe5, 0xb1, 0x6a, 0x2a, 0xde, 0x50, 0x50, 0x6e, 0x67, 0xa3, 0x88, 0xaa, 0x36, 0xfa, - 0x11, 0x64, 0x06, 0x6c, 0x18, 0x48, 0x61, 0xe7, 0xf4, 0x64, 0x57, 0x66, 0x4d, 0xf6, 0x85, 0x42, - 0x18, 0x65, 0x19, 0x38, 0x6a, 0xc2, 0xb2, 0x90, 0x2c, 0xec, 0xf6, 0x38, 0x71, 0x68, 0x37, 0xa4, - 0xdc, 0x63, 0xae, 0x49, 0xc3, 0x2b, 0x57, 0x36, 0xa5, 0x61, 0x0a, 0x3e, 0x7c, 0x5b, 0x71, 0xb6, - 0x15, 0xa5, 0xad, 0x19, 0xa8, 0x0d, 0x85, 0x70, 0xe8, 0xfb, 0x5d, 0x16, 0x46, 0x37, 0x72, 0x74, - 0x76, 0xde, 0x21, 0x64, 0xed, 0xa1, 0xef, 0xef, 0x45, 0x24, 0x6c, 0x85, 0x93, 0x0e, 0xfa, 0x08, - 0x32, 0x3d, 0xce, 0x86, 0x61, 0x74, 0x6e, 0xf2, 0xd8, 0xf4, 0xd0, 0x37, 0x90, 0x15, 0xd4, 0xe1, - 0x54, 0x0a, 0xbb, 0xa0, 0x97, 0xfa, 0xd9, 0xac, 0x41, 0x3a, 0x1a, 0x32, 0x3e, 0x13, 0x38, 0xe6, - 0xa0, 0x15, 0x58, 0x90, 0x72, 0x64, 0x2f, 0x95, 0x53, 0xeb, 0xb9, 0x7a, 0xf6, 0xe2, 0x7c, 0x6d, - 0x61, 0x7f, 0xff, 0x15, 0x56, 0x36, 0x75, 0x5b, 0xf4, 0x99, 0x90, 0x01, 0x19, 0x50, 0xfb, 0x96, - 0x8e, 0xed, 0xb8, 0x8f, 0x5e, 0x01, 0xb8, 0x81, 0xe8, 0x3a, 0x3a, 0x3d, 0xd9, 0xb7, 0xf5, 0xea, - 0xbe, 0xba, 0x79, 0x75, 0x8d, 0xdd, 0x8e, 0xb9, 0x31, 0x97, 0x2e, 0xce, 0xd7, 0xf2, 0xe3, 0x2e, - 0xce, 0xbb, 0x81, 0x88, 0x9a, 0xa8, 0x0e, 0x56, 0x9f, 0x12, 0x5f, 0xf6, 0x9d, 0x3e, 0x75, 0x8e, - 0xed, 0xe2, 0xf5, 0x57, 0xe0, 0x8e, 0x86, 0x19, 0x0f, 0x49, 0x92, 0x52, 0xb0, 0x9a, 0xaa, 0xb0, - 0x97, 0x75, 0xac, 0xa2, 0x0e, 0xfa, 0x04, 0x80, 0x85, 0x34, 0xe8, 0x0a, 0xe9, 0x7a, 0x81, 0x8d, - 0xd4, 0x92, 0x71, 0x5e, 0x59, 0x3a, 0xca, 0x80, 0xee, 0xaa, 0x0b, 0x8a, 0xb8, 0x5d, 0x16, 0xf8, - 0x23, 0xfb, 0x03, 0xfd, 0x35, 0xa7, 0x0c, 0x7b, 0x81, 0x3f, 0x42, 0x6b, 0x60, 0x69, 0x5d, 0x08, - 0xaf, 0x17, 0x10, 0xdf, 0xbe, 0xa3, 0xe3, 0x01, 0xca, 0xd4, 0xd1, 0x16, 0xb5, 0x0f, 0x51, 0x34, - 0x84, 0xfd, 0xe1, 0xf5, 0xfb, 0x60, 0x26, 0x3b, 0xd9, 0x07, 0xc3, 0x41, 0x3f, 0x01, 0x08, 0xb9, - 0x77, 0xe2, 0xf9, 0xb4, 0x47, 0x85, 0xfd, 0x91, 0x5e, 0xf4, 0xea, 0xcc, 0x9b, 0x69, 0x8c, 0xc2, - 0x09, 0x06, 0xaa, 0x42, 0xda, 0x0b, 0x3c, 0x69, 0x7f, 0x6c, 0x6e, 0xa5, 0xcb, 0x52, 0xad, 0x33, - 0xe6, 0x1f, 0x10, 0x7f, 0x48, 0xb1, 0xc6, 0xa1, 0x16, 0xe4, 0x3d, 0xc1, 0x7c, 0x2d, 0x5f, 0xdb, - 0xd6, 0xf9, 0xed, 0x1d, 0xf6, 0xaf, 0x15, 0x53, 0xf0, 0x84, 0x8d, 0xee, 0x41, 0x3e, 0xf4, 0x5c, - 0xf1, 0xdc, 0x1b, 0x78, 0xd2, 0x5e, 0x29, 0xa7, 0xd6, 0x17, 0xf0, 0xc4, 0x80, 0x76, 0x20, 0x2b, - 0x46, 0xc2, 0x91, 0xbe, 0xb0, 0x4b, 0x3a, 0x2e, 0xd5, 0x9b, 0x87, 0xe9, 0x44, 0x84, 0x28, 0x71, - 0xc4, 0x74, 0xb5, 0x05, 0x03, 0x3a, 0x60, 0x7c, 0xd4, 0x15, 0xaf, 0x49, 0x68, 0xdf, 0xd5, 0x23, - 0x41, 0x64, 0xea, 0xbc, 0x26, 0x21, 0xda, 0x81, 0xe5, 0x04, 0x20, 0xf4, 0x02, 0x2a, 0x84, 0x7d, - 0x4f, 0x07, 0xe4, 0xee, 0x95, 0x80, 0xb4, 0x02, 0xf9, 0xe8, 0x61, 0x14, 0x91, 0xe2, 0xc4, 0x47, - 0x44, 0x2a, 0x7d, 0x0d, 0x56, 0x22, 0x77, 0xa9, 0x9c, 0x73, 0x4c, 0x47, 0x26, 0x1d, 0xaa, 0xa6, - 0x12, 0xd8, 0x89, 0xe2, 0xea, 0x7c, 0x9d, 0xc7, 0x51, 0xe7, 0xc9, 0xfc, 0xe3, 0x54, 0x69, 0x13, - 0xac, 0xc4, 0x19, 0x46, 0x9f, 0xa9, 0xbb, 0xa4, 0xe7, 0x09, 0xc9, 0x47, 0x5d, 0x32, 0x94, 0x7d, - 0xfb, 0x67, 0x9a, 0x50, 0x88, 0x8d, 0xb5, 0xa1, 0xec, 0x97, 0xba, 0x30, 0x39, 0x0a, 0xa8, 0x0c, - 0x96, 0x3a, 0x62, 0x82, 0xf2, 0x13, 0xca, 0x55, 0x9d, 0xa6, 0x14, 0x9c, 0x34, 0xa9, 0x54, 0x20, - 0x28, 0xe1, 0x4e, 0x5f, 0x67, 0xe2, 0x3c, 0x36, 0x3d, 0x95, 0x5a, 0xe3, 0x7c, 0x63, 0x52, 0xab, - 0xe9, 0x96, 0x9e, 0x40, 0x21, 0x19, 0xd3, 0xff, 0x64, 0x41, 0x95, 0x3f, 0xa5, 0x20, 0x3f, 0xde, - 0x77, 0xf4, 0x10, 0x96, 0x5b, 0x9d, 0xbd, 0xe7, 0xb5, 0xfd, 0xd6, 0xde, 0x6e, 0xb7, 0xd1, 0xfc, - 0xb6, 0xf6, 0xf2, 0xf9, 0x7e, 0x71, 0xae, 0xf4, 0xc9, 0xe9, 0x59, 0x79, 0x65, 0x72, 0xc5, 0xc4, - 0xf0, 0x06, 0x3d, 0x22, 0x43, 0x5f, 0x4e, 0xb3, 0xda, 0x78, 0x6f, 0xab, 0xd9, 0xe9, 0x14, 0x53, - 0xd7, 0xb1, 0xda, 0x9c, 0x39, 0x54, 0x08, 0xb4, 0x09, 0xc5, 0x09, 0x6b, 0xe7, 0x55, 0xbb, 0x89, - 0x0f, 0x8a, 0xf3, 0xa5, 0x7b, 0xa7, 0x67, 0x65, 0xfb, 0x2a, 0x69, 0x67, 0x14, 0x52, 0x7e, 0x60, - 0xde, 0x47, 0xff, 0x48, 0x41, 0x21, 0x59, 0x5e, 0xa3, 0xad, 0xa8, 0x2c, 0xd6, 0x2b, 0xbe, 0xb5, - 0xb9, 0x71, 0x53, 0x39, 0xae, 0xaf, 0x75, 0x7f, 0xa8, 0xfc, 0xbe, 0x50, 0x2f, 0x61, 0x4d, 0x46, - 0x0f, 0x61, 0x31, 0x64, 0x5c, 0xc6, 0x17, 0xe0, 0xec, 0xe3, 0xc9, 0x78, 0x5c, 0xb4, 0x45, 0xe0, - 0x4a, 0x1f, 0x6e, 0x4d, 0x7b, 0x43, 0xf7, 0x61, 0xe1, 0xa0, 0xd5, 0x2e, 0xce, 0x95, 0xee, 0x9e, - 0x9e, 0x95, 0x3f, 0x9e, 0xfe, 0x78, 0xe0, 0x71, 0x39, 0x24, 0x7e, 0xab, 0x8d, 0xbe, 0x84, 0xc5, - 0xc6, 0x6e, 0x07, 0xe3, 0x62, 0xaa, 0xb4, 0x76, 0x7a, 0x56, 0xbe, 0x3b, 0x8d, 0x53, 0x9f, 0xd8, - 0x30, 0x70, 0x31, 0x3b, 0x1c, 0xbf, 0x0a, 0xff, 0x39, 0x0f, 0x96, 0xa9, 0x0b, 0xde, 0xf7, 0x8f, - 0x83, 0xa5, 0xa8, 0xe8, 0x8d, 0x13, 0xfe, 0xfc, 0x8d, 0xb5, 0x6f, 0x21, 0x22, 0x18, 0x4d, 0x7f, - 0x0a, 0x05, 0x2f, 0x3c, 0x79, 0xd4, 0xa5, 0x01, 0x39, 0xf4, 0xcd, 0x03, 0x31, 0x87, 0x2d, 0x65, - 0x6b, 0x46, 0x26, 0x75, 0xdb, 0x78, 0x81, 0xa4, 0x3c, 0x30, 0x4f, 0xbf, 0x1c, 0x1e, 0xf7, 0xd1, - 0x37, 0x90, 0xf6, 0x42, 0x32, 0x30, 0x05, 0xfb, 0xcc, 0x15, 0xb4, 0xda, 0xb5, 0x17, 0xe6, 0xcc, - 0xd5, 0x73, 0x17, 0xe7, 0x6b, 0x69, 0x65, 0xc0, 0x9a, 0x86, 0x56, 0xe3, 0x9a, 0x59, 0x8d, 0xa4, - 0x2b, 0x87, 0x1c, 0x4e, 0x58, 0xd4, 0xb9, 0xf1, 0x82, 0x1e, 0x57, 0xd9, 0x22, 0xab, 0x3f, 0xc6, - 0x5d, 0x54, 0x82, 0xac, 0xa9, 0xbc, 0x75, 0xa9, 0x9d, 0x57, 0x55, 0xad, 0x31, 0xd4, 0x97, 0xc0, - 0x8a, 0xa2, 0xd1, 0x3d, 0xe2, 0x6c, 0x50, 0xf9, 0x57, 0x1a, 0xac, 0x2d, 0x7f, 0x28, 0xa4, 0x29, - 0xa2, 0xde, 0x5b, 0xf0, 0x5f, 0xc1, 0x32, 0xd1, 0x3f, 0x22, 0x48, 0xa0, 0x2a, 0x12, 0xfd, 0xa0, - 0x31, 0x1b, 0x70, 0x7f, 0xa6, 0xbb, 0x31, 0x38, 0x7a, 0xfc, 0xd4, 0x33, 0xca, 0xa7, 0x9d, 0xc2, - 0x45, 0x72, 0xe9, 0x0b, 0xea, 0xc0, 0x12, 0xe3, 0x4e, 0x9f, 0x0a, 0x19, 0xd5, 0x31, 0xe6, 0xe1, - 0x3e, 0xf3, 0x97, 0xce, 0x5e, 0x12, 0x68, 0x2e, 0xf1, 0x68, 0xb6, 0xd3, 0x3e, 0xd0, 0x63, 0x48, - 0x73, 0x72, 0x14, 0x3f, 0xce, 0x66, 0x1e, 0x12, 0x4c, 0x8e, 0xe4, 0x94, 0x0b, 0xcd, 0x40, 0x3f, - 0x07, 0x70, 0x3d, 0x11, 0x12, 0xe9, 0xf4, 0x29, 0x37, 0x9b, 0x3d, 0x73, 0x89, 0x8d, 0x31, 0x6a, - 0xca, 0x4b, 0x82, 0x8d, 0x9e, 0x41, 0xde, 0x21, 0xb1, 0x5c, 0x33, 0xd7, 0xff, 0xcd, 0xd8, 0xaa, - 0x19, 0x17, 0x45, 0xe5, 0xe2, 0xe2, 0x7c, 0x2d, 0x17, 0x5b, 0x70, 0xce, 0x21, 0x46, 0xbe, 0xcf, - 0x60, 0x49, 0x12, 0x71, 0xdc, 0x75, 0xa3, 0x74, 0x16, 0xc9, 0xe4, 0x9a, 0xa2, 0x44, 0x3d, 0x99, - 0x4d, 0xda, 0x8b, 0xb7, 0xb3, 0x20, 0x13, 0x36, 0xf4, 0x0b, 0x58, 0xa6, 0x81, 0xc3, 0x47, 0x5a, - 0xac, 0xf1, 0x0c, 0x73, 0xd7, 0x2f, 0xb6, 0x39, 0x06, 0x4f, 0x2d, 0xb6, 0x48, 0x2f, 0xd9, 0x2b, - 0x7f, 0x4b, 0x01, 0x44, 0x75, 0xde, 0xfb, 0x15, 0x20, 0x82, 0xb4, 0x4b, 0x24, 0xd1, 0x9a, 0x2b, - 0x60, 0xdd, 0x46, 0x4f, 0x00, 0x24, 0x1d, 0x84, 0x2a, 0xf5, 0x06, 0x3d, 0x23, 0x9b, 0xb7, 0xa5, - 0x83, 0x04, 0x1a, 0x6d, 0x42, 0xc6, 0x3c, 0xa1, 0xd3, 0x37, 0xf2, 0x0c, 0xb2, 0xf2, 0x87, 0x14, - 0x40, 0xb4, 0xcc, 0xff, 0xe9, 0xb5, 0xd5, 0xed, 0x37, 0xdf, 0xaf, 0xce, 0xfd, 0xf5, 0xfb, 0xd5, - 0xb9, 0xdf, 0x5c, 0xac, 0xa6, 0xde, 0x5c, 0xac, 0xa6, 0xfe, 0x7c, 0xb1, 0x9a, 0xfa, 0xfb, 0xc5, - 0x6a, 0xea, 0x30, 0xa3, 0x2b, 0x8f, 0x1f, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x67, 0x32, 0x8c, - 0x8f, 0xb8, 0x16, 0x00, 0x00, + 0xd0, 0xa6, 0xbe, 0xcb, 0xfc, 0x1e, 0x5a, 0x87, 0x5c, 0x6d, 0x6b, 0xab, 0xd9, 0xde, 0x6f, 0x36, + 0x8a, 0xa9, 0x52, 0xe9, 0xf4, 0xac, 0xfc, 0xd1, 0x34, 0xb0, 0xe6, 0x38, 0x34, 0x90, 0xd4, 0x2d, + 0xa5, 0xbf, 0xfb, 0xfd, 0xea, 0x5c, 0xe5, 0xbb, 0x14, 0x14, 0x92, 0x93, 0x40, 0x0f, 0x20, 0x53, + 0xdb, 0xda, 0x6f, 0x1d, 0x34, 0x8b, 0x73, 0x13, 0x7a, 0x12, 0x51, 0x73, 0x24, 0x3b, 0xa1, 0xe8, + 0x33, 0x58, 0x6c, 0xd7, 0x5e, 0x76, 0x9a, 0xc5, 0xd4, 0x64, 0x3a, 0x49, 0x58, 0x9b, 0x0c, 0x43, + 0x8d, 0x6a, 0xe0, 0x5a, 0x6b, 0xb7, 0x38, 0x3f, 0x1b, 0xd5, 0x10, 0x84, 0xf9, 0x66, 0x2a, 0xbf, + 0x4b, 0x83, 0xd5, 0xa1, 0xe2, 0x84, 0x39, 0xef, 0x59, 0x22, 0x8f, 0x20, 0x2d, 0x49, 0x78, 0xac, + 0xa5, 0x61, 0xcd, 0x96, 0xc6, 0x3e, 0x09, 0x8f, 0xd5, 0xa0, 0x86, 0xae, 0xf1, 0x4a, 0x19, 0x82, + 0x06, 0x1e, 0x73, 0x88, 0xa4, 0xae, 0x56, 0x86, 0xb5, 0xf9, 0xf9, 0x2c, 0x36, 0x1e, 0xa3, 0xcc, + 0xfc, 0x77, 0xe6, 0x70, 0x82, 0x8a, 0x9e, 0x42, 0xa6, 0xe7, 0xf1, 0x43, 0xe2, 0x69, 0x4d, 0x58, + 0x9b, 0x9f, 0xcc, 0x72, 0xb2, 0xad, 0x11, 0x13, 0x07, 0x86, 0x82, 0x1e, 0x43, 0x66, 0x18, 0xb8, + 0x44, 0x52, 0x3b, 0xa3, 0xc9, 0xe5, 0x59, 0xe4, 0x97, 0x1a, 0xb1, 0xc5, 0xfd, 0x23, 0xd6, 0xc3, + 0x06, 0x8f, 0x9e, 0x41, 0xce, 0xa7, 0xf2, 0x35, 0x17, 0xc7, 0xa1, 0x9d, 0x2d, 0x2f, 0xac, 0x5b, + 0x9b, 0x5f, 0xcd, 0x14, 0x63, 0x84, 0xa9, 0x49, 0x49, 0x9c, 0xfe, 0x80, 0xfa, 0x32, 0x72, 0x53, + 0x9f, 0xb7, 0x53, 0x78, 0xec, 0x00, 0xfd, 0x18, 0x72, 0xd4, 0x77, 0x03, 0xce, 0x7c, 0x69, 0xe7, + 0xae, 0x9f, 0x48, 0xd3, 0x60, 0x54, 0x30, 0xf1, 0x98, 0xa1, 0xd8, 0x82, 0x7b, 0xde, 0x21, 0x71, + 0x8e, 0xed, 0xfc, 0x3b, 0x2e, 0x63, 0xcc, 0xa8, 0x67, 0x20, 0x3d, 0xe0, 0x2e, 0xad, 0x6c, 0xc0, + 0xf2, 0x95, 0x50, 0xa3, 0x12, 0xe4, 0x4c, 0xa8, 0x23, 0x8d, 0xa4, 0xf1, 0xb8, 0x5f, 0xb9, 0x0d, + 0x4b, 0x53, 0x61, 0xad, 0xfc, 0x71, 0x11, 0x72, 0xf1, 0x5e, 0xa3, 0x1a, 0xe4, 0x1d, 0xee, 0x4b, + 0xc2, 0x7c, 0x2a, 0x8c, 0xbc, 0x66, 0xee, 0xcc, 0x56, 0x0c, 0x52, 0xac, 0x9d, 0x39, 0x3c, 0x61, + 0xa1, 0x6f, 0x21, 0x2f, 0x68, 0xc8, 0x87, 0xc2, 0xa1, 0xa1, 0xd1, 0xd7, 0xfa, 0x6c, 0x85, 0x44, + 0x20, 0x4c, 0x7f, 0x3d, 0x64, 0x82, 0xaa, 0x28, 0x87, 0x78, 0x42, 0x45, 0x4f, 0x21, 0x2b, 0x68, + 0x28, 0x89, 0x90, 0x6f, 0x93, 0x08, 0x8e, 0x20, 0x6d, 0xee, 0x31, 0x67, 0x84, 0x63, 0x06, 0x7a, + 0x0a, 0xf9, 0xc0, 0x23, 0x8e, 0xf6, 0x6a, 0x2f, 0x6a, 0xfa, 0xfd, 0x59, 0xf4, 0x76, 0x0c, 0xc2, + 0x13, 0x3c, 0xfa, 0x1a, 0xc0, 0xe3, 0xbd, 0xae, 0x2b, 0xd8, 0x09, 0x15, 0x46, 0x62, 0xa5, 0x59, + 0xec, 0x86, 0x46, 0xe0, 0xbc, 0xc7, 0x7b, 0x51, 0x13, 0x6d, 0xff, 0x57, 0xfa, 0x4a, 0x68, 0xeb, + 0x19, 0x00, 0x19, 0x7f, 0x35, 0xea, 0xfa, 0xe2, 0x9d, 0x5c, 0x99, 0x1d, 0x49, 0xd0, 0xd1, 0x27, + 0x50, 0x38, 0xe2, 0xc2, 0xa1, 0x5d, 0x73, 0x6a, 0xf2, 0x5a, 0x13, 0x96, 0xb6, 0x45, 0xfa, 0x42, + 0x75, 0xc8, 0xf6, 0xa8, 0x4f, 0x05, 0x73, 0x6c, 0xd0, 0x83, 0x3d, 0x98, 0x79, 0x20, 0x23, 0x08, + 0x1e, 0xfa, 0x92, 0x0d, 0xa8, 0x19, 0x29, 0x26, 0xa2, 0x5f, 0xc1, 0x07, 0xf1, 0xf6, 0x75, 0x05, + 0x3d, 0xa2, 0x82, 0xfa, 0x4a, 0x03, 0x96, 0x8e, 0xc3, 0xe7, 0x6f, 0xd7, 0x80, 0x41, 0x9b, 0x64, + 0x83, 0xc4, 0xe5, 0x0f, 0x61, 0x3d, 0x0f, 0x59, 0x11, 0x8d, 0x5b, 0xf9, 0x6d, 0x4a, 0xa9, 0xfe, + 0x12, 0x02, 0x6d, 0x80, 0x35, 0x1e, 0x9e, 0xb9, 0x5a, 0xbd, 0xf9, 0xfa, 0xad, 0x8b, 0xf3, 0x35, + 0x88, 0xb1, 0xad, 0x86, 0xca, 0x41, 0xa6, 0xed, 0xa2, 0x26, 0x2c, 0x8d, 0x09, 0xaa, 0x0c, 0x30, + 0x17, 0x65, 0xf9, 0x6d, 0x33, 0xdd, 0x1f, 0x05, 0x14, 0x17, 0x44, 0xa2, 0x57, 0xf9, 0x25, 0xa0, + 0xab, 0x71, 0x41, 0x08, 0xd2, 0xc7, 0xcc, 0x37, 0xd3, 0xc0, 0xba, 0x8d, 0xaa, 0x90, 0x0d, 0xc8, + 0xc8, 0xe3, 0xc4, 0x35, 0x07, 0xe3, 0x4e, 0x35, 0x2a, 0x10, 0xaa, 0x71, 0x81, 0x50, 0xad, 0xf9, + 0x23, 0x1c, 0x83, 0x2a, 0xcf, 0xe0, 0xc3, 0x99, 0xdb, 0x8b, 0x36, 0xa1, 0x30, 0x3e, 0x70, 0x93, + 0xb5, 0xde, 0xbe, 0x38, 0x5f, 0xb3, 0xc6, 0x27, 0xb3, 0xd5, 0xc0, 0xd6, 0x18, 0xd4, 0x72, 0x2b, + 0xff, 0x58, 0x82, 0xa5, 0xa9, 0x63, 0x8b, 0xee, 0xc0, 0x22, 0x1b, 0x90, 0x1e, 0x35, 0x73, 0x8c, + 0x3a, 0xa8, 0x09, 0x19, 0x8f, 0x1c, 0x52, 0x4f, 0x1d, 0x5e, 0xb5, 0x71, 0xff, 0x7f, 0xe3, 0xf9, + 0xaf, 0x3e, 0xd7, 0xf8, 0xa6, 0x2f, 0xc5, 0x08, 0x1b, 0x32, 0xb2, 0x21, 0xeb, 0xf0, 0xc1, 0x80, + 0xf8, 0xea, 0x9a, 0x58, 0x58, 0xcf, 0xe3, 0xb8, 0xab, 0x22, 0x43, 0x44, 0x2f, 0xb4, 0xd3, 0xda, + 0xac, 0xdb, 0xa8, 0x08, 0x0b, 0xd4, 0x3f, 0xb1, 0x17, 0xb5, 0x49, 0x35, 0x95, 0xc5, 0x65, 0xd1, + 0xe9, 0xcb, 0x63, 0xd5, 0x54, 0xbc, 0x61, 0x48, 0x85, 0x9d, 0x8d, 0x22, 0xaa, 0xda, 0xe8, 0x47, + 0x90, 0x19, 0xf0, 0xa1, 0x2f, 0x43, 0x3b, 0xa7, 0x27, 0xbb, 0x32, 0x6b, 0xb2, 0x2f, 0x14, 0xc2, + 0x28, 0xcb, 0xc0, 0x51, 0x13, 0x96, 0x43, 0xc9, 0x83, 0x6e, 0x4f, 0x10, 0x87, 0x76, 0x03, 0x2a, + 0x18, 0x77, 0x4d, 0x1a, 0x5e, 0xb9, 0xb2, 0x29, 0x0d, 0x53, 0xf0, 0xe1, 0xdb, 0x8a, 0xb3, 0xad, + 0x28, 0x6d, 0xcd, 0x40, 0x6d, 0x28, 0x04, 0x43, 0xcf, 0xeb, 0xf2, 0x20, 0xba, 0x91, 0xa3, 0xb3, + 0xf3, 0x0e, 0x21, 0x6b, 0x0f, 0x3d, 0x6f, 0x2f, 0x22, 0x61, 0x2b, 0x98, 0x74, 0xd0, 0x47, 0x90, + 0xe9, 0x09, 0x3e, 0x0c, 0xa2, 0x73, 0x93, 0xc7, 0xa6, 0x87, 0xbe, 0x81, 0x6c, 0x48, 0x1d, 0x41, + 0x65, 0x68, 0x17, 0xf4, 0x52, 0x3f, 0x9d, 0x35, 0x48, 0x47, 0x43, 0xc6, 0x67, 0x02, 0xc7, 0x1c, + 0xb4, 0x02, 0x0b, 0x52, 0x8e, 0xec, 0xa5, 0x72, 0x6a, 0x3d, 0x57, 0xcf, 0x5e, 0x9c, 0xaf, 0x2d, + 0xec, 0xef, 0xbf, 0xc2, 0xca, 0xa6, 0x6e, 0x8b, 0x3e, 0x0f, 0xa5, 0x4f, 0x06, 0xd4, 0xbe, 0xa5, + 0x63, 0x3b, 0xee, 0xa3, 0x57, 0x00, 0xae, 0x1f, 0x76, 0x1d, 0x9d, 0x9e, 0xec, 0xdb, 0x7a, 0x75, + 0x5f, 0xdd, 0xbc, 0xba, 0xc6, 0x6e, 0xc7, 0xdc, 0x98, 0x4b, 0x17, 0xe7, 0x6b, 0xf9, 0x71, 0x17, + 0xe7, 0x5d, 0x3f, 0x8c, 0x9a, 0xa8, 0x0e, 0x56, 0x9f, 0x12, 0x4f, 0xf6, 0x9d, 0x3e, 0x75, 0x8e, + 0xed, 0xe2, 0xf5, 0x57, 0xe0, 0x8e, 0x86, 0x19, 0x0f, 0x49, 0x92, 0x52, 0xb0, 0x9a, 0x6a, 0x68, + 0x2f, 0xeb, 0x58, 0x45, 0x1d, 0x74, 0x1f, 0x80, 0x07, 0xd4, 0xef, 0x86, 0xd2, 0x65, 0xbe, 0x8d, + 0xd4, 0x92, 0x71, 0x5e, 0x59, 0x3a, 0xca, 0x80, 0xee, 0xaa, 0x0b, 0x8a, 0xb8, 0x5d, 0xee, 0x7b, + 0x23, 0xfb, 0x03, 0xfd, 0x35, 0xa7, 0x0c, 0x7b, 0xbe, 0x37, 0x42, 0x6b, 0x60, 0x69, 0x5d, 0x84, + 0xac, 0xe7, 0x13, 0xcf, 0xbe, 0xa3, 0xe3, 0x01, 0xca, 0xd4, 0xd1, 0x16, 0xb5, 0x0f, 0x51, 0x34, + 0x42, 0xfb, 0xc3, 0xeb, 0xf7, 0xc1, 0x4c, 0x76, 0xb2, 0x0f, 0x86, 0x83, 0x7e, 0x02, 0x10, 0x08, + 0x76, 0xc2, 0x3c, 0xda, 0xa3, 0xa1, 0xfd, 0x91, 0x5e, 0xf4, 0xea, 0xcc, 0x9b, 0x69, 0x8c, 0xc2, + 0x09, 0x06, 0xaa, 0x42, 0x9a, 0xf9, 0x4c, 0xda, 0x1f, 0x9b, 0x5b, 0xe9, 0xb2, 0x54, 0xeb, 0x9c, + 0x7b, 0x07, 0xc4, 0x1b, 0x52, 0xac, 0x71, 0xa8, 0x05, 0x79, 0x16, 0x72, 0x4f, 0xcb, 0xd7, 0xb6, + 0x75, 0x7e, 0x7b, 0x87, 0xfd, 0x6b, 0xc5, 0x14, 0x3c, 0x61, 0xa3, 0x7b, 0x90, 0x0f, 0x98, 0x1b, + 0x3e, 0x67, 0x03, 0x26, 0xed, 0x95, 0x72, 0x6a, 0x7d, 0x01, 0x4f, 0x0c, 0x68, 0x07, 0xb2, 0xe1, + 0x28, 0x74, 0xa4, 0x17, 0xda, 0x25, 0x1d, 0x97, 0xea, 0xcd, 0xc3, 0x74, 0x22, 0x42, 0x94, 0x38, + 0x62, 0xba, 0xda, 0x82, 0x01, 0x1d, 0x70, 0x31, 0xea, 0x86, 0xaf, 0x49, 0x60, 0xdf, 0xd5, 0x23, + 0x41, 0x64, 0xea, 0xbc, 0x26, 0x01, 0xda, 0x81, 0xe5, 0x04, 0x20, 0x60, 0x3e, 0x0d, 0x43, 0xfb, + 0x9e, 0x0e, 0xc8, 0xdd, 0x2b, 0x01, 0x69, 0xf9, 0xf2, 0xd1, 0xc3, 0x28, 0x22, 0xc5, 0x89, 0x8f, + 0x88, 0x84, 0x2a, 0x50, 0x70, 0x48, 0x10, 0x15, 0xde, 0x8c, 0x86, 0xf6, 0x7d, 0x2d, 0xa3, 0x29, + 0x5b, 0xe9, 0x6b, 0xb0, 0x12, 0xf9, 0x4d, 0xe5, 0xa5, 0x63, 0x3a, 0x32, 0x29, 0x53, 0x35, 0x95, + 0x08, 0x4f, 0x94, 0x7f, 0x9d, 0xd3, 0xf3, 0x38, 0xea, 0x3c, 0x99, 0x7f, 0x9c, 0x2a, 0x6d, 0x82, + 0x95, 0x38, 0xe7, 0xe8, 0x53, 0x75, 0xdf, 0xf4, 0x58, 0x28, 0xc5, 0xa8, 0x4b, 0x86, 0xb2, 0x6f, + 0xff, 0x4c, 0x13, 0x0a, 0xb1, 0xb1, 0x36, 0x94, 0xfd, 0x52, 0x17, 0x26, 0xc7, 0x05, 0x95, 0xc1, + 0x52, 0xc7, 0x30, 0xa4, 0xe2, 0x84, 0x0a, 0x55, 0xcb, 0xa9, 0xe9, 0x25, 0x4d, 0x2a, 0x5d, 0x84, + 0x94, 0x08, 0xa7, 0xaf, 0xb3, 0x75, 0x1e, 0x9b, 0x9e, 0x4a, 0xbf, 0x71, 0x4e, 0x32, 0xe9, 0xd7, + 0x74, 0x4b, 0x4f, 0xa0, 0x90, 0x8c, 0xfb, 0x7f, 0xb2, 0xa0, 0xca, 0x9f, 0x52, 0x90, 0x1f, 0x6b, + 0x03, 0x3d, 0x84, 0xe5, 0x56, 0x67, 0xef, 0x79, 0x6d, 0xbf, 0xb5, 0xb7, 0xdb, 0x6d, 0x34, 0xbf, + 0xad, 0xbd, 0x7c, 0xbe, 0x5f, 0x9c, 0x2b, 0xdd, 0x3f, 0x3d, 0x2b, 0xaf, 0x4c, 0xae, 0xa1, 0x18, + 0xde, 0xa0, 0x47, 0x64, 0xe8, 0xc9, 0x69, 0x56, 0x1b, 0xef, 0x6d, 0x35, 0x3b, 0x9d, 0x62, 0xea, + 0x3a, 0x56, 0x5b, 0x70, 0x47, 0xed, 0xd4, 0x26, 0x14, 0x27, 0xac, 0x9d, 0x57, 0xed, 0x26, 0x3e, + 0x28, 0xce, 0x97, 0xee, 0x9d, 0x9e, 0x95, 0xed, 0xab, 0xa4, 0x9d, 0x51, 0x40, 0xc5, 0x81, 0x79, + 0x43, 0xfd, 0x3d, 0x05, 0x85, 0x64, 0x09, 0x8e, 0xb6, 0xa2, 0xd2, 0x59, 0xaf, 0xf8, 0xd6, 0xe6, + 0xc6, 0x4d, 0x25, 0xbb, 0xbe, 0xfa, 0xbd, 0xa1, 0xf2, 0xfb, 0x42, 0xbd, 0x96, 0x35, 0x19, 0x3d, + 0x84, 0xc5, 0x80, 0x0b, 0x19, 0x5f, 0x92, 0xb3, 0x8f, 0x30, 0x17, 0x71, 0x61, 0x17, 0x81, 0x2b, + 0x7d, 0xb8, 0x35, 0xed, 0x0d, 0x7d, 0x06, 0x0b, 0x07, 0xad, 0x76, 0x71, 0xae, 0x74, 0xf7, 0xf4, + 0xac, 0xfc, 0xf1, 0xf4, 0xc7, 0x03, 0x26, 0xe4, 0x90, 0x78, 0xad, 0x36, 0xfa, 0x12, 0x16, 0x1b, + 0xbb, 0x1d, 0x8c, 0x8b, 0xa9, 0xd2, 0xda, 0xe9, 0x59, 0xf9, 0xee, 0x34, 0x4e, 0x7d, 0xe2, 0x43, + 0xdf, 0xc5, 0xfc, 0x70, 0xfc, 0x72, 0xfc, 0xe7, 0x3c, 0x58, 0xa6, 0x76, 0x78, 0xdf, 0x3f, 0x17, + 0x96, 0xa2, 0xc2, 0x38, 0xbe, 0x14, 0xe6, 0x6f, 0xac, 0x8f, 0x0b, 0x11, 0xc1, 0x68, 0xfa, 0x13, + 0x28, 0xb0, 0xe0, 0xe4, 0x51, 0x97, 0xfa, 0xe4, 0xd0, 0x33, 0x8f, 0xc8, 0x1c, 0xb6, 0x94, 0xad, + 0x19, 0x99, 0xd4, 0x8d, 0xc4, 0x7c, 0x49, 0x85, 0x6f, 0x9e, 0x87, 0x39, 0x3c, 0xee, 0xa3, 0x6f, + 0x20, 0xcd, 0x02, 0x32, 0x30, 0x45, 0xfd, 0xcc, 0x15, 0xb4, 0xda, 0xb5, 0x17, 0xe6, 0xcc, 0xd5, + 0x73, 0x17, 0xe7, 0x6b, 0x69, 0x65, 0xc0, 0x9a, 0x86, 0x56, 0xe3, 0xba, 0x5a, 0x8d, 0xa4, 0xab, + 0x8b, 0x1c, 0x4e, 0x58, 0xd4, 0xb9, 0x61, 0x7e, 0x4f, 0xa8, 0x8c, 0x92, 0xd5, 0x1f, 0xe3, 0x2e, + 0x2a, 0x41, 0xd6, 0x54, 0xe7, 0xba, 0x1c, 0xcf, 0xab, 0xca, 0xd7, 0x18, 0xea, 0x4b, 0x60, 0x45, + 0xd1, 0xe8, 0x1e, 0x09, 0x3e, 0xa8, 0xfc, 0x2b, 0x0d, 0xd6, 0x96, 0x37, 0x0c, 0xa5, 0x29, 0xb4, + 0xde, 0x5b, 0xf0, 0x5f, 0xc1, 0x32, 0xd1, 0x3f, 0x2b, 0x88, 0xaf, 0xaa, 0x16, 0xfd, 0xe8, 0x31, + 0x1b, 0xf0, 0xd9, 0x4c, 0x77, 0x63, 0x70, 0xf4, 0x40, 0xaa, 0x67, 0x94, 0x4f, 0x3b, 0x85, 0x8b, + 0xe4, 0xd2, 0x17, 0xd4, 0x81, 0x25, 0x2e, 0x9c, 0x3e, 0x0d, 0x65, 0x54, 0xeb, 0x98, 0xc7, 0xfd, + 0xcc, 0xdf, 0x3e, 0x7b, 0x49, 0xa0, 0xb9, 0xe8, 0xa3, 0xd9, 0x4e, 0xfb, 0x40, 0x8f, 0x21, 0x2d, + 0xc8, 0x51, 0xfc, 0x80, 0x9b, 0x79, 0x48, 0x30, 0x39, 0x92, 0x53, 0x2e, 0x34, 0x03, 0xfd, 0x1c, + 0xc0, 0x65, 0x61, 0x40, 0xa4, 0xd3, 0xa7, 0xc2, 0x6c, 0xf6, 0xcc, 0x25, 0x36, 0xc6, 0xa8, 0x29, + 0x2f, 0x09, 0x36, 0x7a, 0x06, 0x79, 0x87, 0xc4, 0x72, 0xcd, 0x5c, 0xff, 0xc7, 0x63, 0xab, 0x66, + 0x5c, 0x14, 0x95, 0x8b, 0x8b, 0xf3, 0xb5, 0x5c, 0x6c, 0xc1, 0x39, 0x87, 0x18, 0xf9, 0x3e, 0x83, + 0x25, 0x49, 0xc2, 0xe3, 0xae, 0x1b, 0xa5, 0xb3, 0x48, 0x26, 0xd7, 0x14, 0x2e, 0xea, 0x59, 0x6d, + 0xd2, 0x5e, 0xbc, 0x9d, 0x05, 0x99, 0xb0, 0xa1, 0x5f, 0xc0, 0x32, 0xf5, 0x1d, 0x31, 0xd2, 0x62, + 0x8d, 0x67, 0x98, 0xbb, 0x7e, 0xb1, 0xcd, 0x31, 0x78, 0x6a, 0xb1, 0x45, 0x7a, 0xc9, 0x5e, 0xf9, + 0x6b, 0x0a, 0x20, 0xaa, 0x05, 0xdf, 0xaf, 0x00, 0x11, 0xa4, 0x5d, 0x22, 0x89, 0xd6, 0x5c, 0x01, + 0xeb, 0x36, 0x7a, 0x02, 0x20, 0xe9, 0x20, 0x50, 0xa9, 0xd7, 0xef, 0x19, 0xd9, 0xbc, 0x2d, 0x1d, + 0x24, 0xd0, 0x68, 0x13, 0x32, 0xe6, 0x99, 0x9d, 0xbe, 0x91, 0x67, 0x90, 0x95, 0x3f, 0xa4, 0x00, + 0xa2, 0x65, 0xfe, 0x4f, 0xaf, 0xad, 0x6e, 0xbf, 0xf9, 0x7e, 0x75, 0xee, 0x2f, 0xdf, 0xaf, 0xce, + 0xfd, 0xe6, 0x62, 0x35, 0xf5, 0xe6, 0x62, 0x35, 0xf5, 0xe7, 0x8b, 0xd5, 0xd4, 0xdf, 0x2e, 0x56, + 0x53, 0x87, 0x19, 0x5d, 0x9d, 0xfc, 0xf0, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0x1e, 0xc9, + 0x31, 0xdc, 0x16, 0x00, 0x00, } diff --git a/api/specs.proto b/api/specs.proto index 069419c8d4..b20c635d1b 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -341,6 +341,9 @@ message ContainerSpec { // to the container OS's default - generally 60, or the value predefined in // the image; set to -1 to unset a previously set value google.protobuf.Int64Value memory_swappiness = 28; + + // Capabilities is the list of Linux capabilities to be available for container (this overrides the default set of capabilities) + repeated string capabilities = 29; } // EndpointSpec defines the properties that can be configured to diff --git a/cmd/swarmctl/service/flagparser/capability.go b/cmd/swarmctl/service/flagparser/capability.go new file mode 100644 index 0000000000..bec96d2a1f --- /dev/null +++ b/cmd/swarmctl/service/flagparser/capability.go @@ -0,0 +1,66 @@ +package flagparser + +import ( + "github.com/docker/swarmkit/api" + "github.com/spf13/cobra" +) + +// ParseAddCapability validates capabilities passed on the command line +func ParseAddCapability(cmd *cobra.Command, spec *api.ServiceSpec, flagName string) error { + flags := cmd.Flags() + + if flags.Changed(flagName) { + capabilities, err := flags.GetStringSlice(flagName) + if err != nil { + return err + } + + container := spec.Task.GetContainer() + if container == nil { + spec.Task.Runtime = &api.TaskSpec_Container{ + Container: &api.ContainerSpec{}, + } + } + + for _, capability := range capabilities { + container.Capabilities = append(container.Capabilities, capability) + } + } + + return nil +} + +// ParseRemoveCapability removes a set of capabilities from the task spec's capability references +func ParseRemoveCapability(cmd *cobra.Command, spec *api.ServiceSpec, flagName string) error { + flags := cmd.Flags() + + if flags.Changed(flagName) { + capabilities, err := flags.GetStringSlice(flagName) + if err != nil { + return err + } + + container := spec.Task.GetContainer() + if container == nil { + return nil + } + + wantToDelete := make(map[string]struct{}) + + for _, capability := range capabilities { + wantToDelete[capability] = struct{}{} + } + + var newCapabilities []string + for _, capabilityRef := range container.Capabilities { + if _, ok := wantToDelete[capabilityRef]; ok { + continue + } + newCapabilities = append(newCapabilities, capabilityRef) + } + + container.Capabilities = newCapabilities + } + + return nil +} diff --git a/cmd/swarmctl/service/update.go b/cmd/swarmctl/service/update.go index 6f15cc2232..9dc3df35ba 100644 --- a/cmd/swarmctl/service/update.go +++ b/cmd/swarmctl/service/update.go @@ -54,6 +54,13 @@ var ( return err } + if err := flagparser.ParseAddCapability(cmd, spec, "add-capability"); err != nil { + return err + } + if err := flagparser.ParseRemoveCapability(cmd, spec, "rm-capability"); err != nil { + return err + } + if reflect.DeepEqual(spec, &service.Spec) { return errors.New("no changes detected") } @@ -77,6 +84,8 @@ func init() { updateCmd.Flags().StringSlice("rm-secret", nil, "remove a secret from the service") updateCmd.Flags().StringSlice("add-config", nil, "add a new config to the service") updateCmd.Flags().StringSlice("rm-config", nil, "remove a config from the service") + updateCmd.Flags().StringSlice("add-capability", nil, "add a new capability to the service") + updateCmd.Flags().StringSlice("rm-capability", nil, "remove a capability from the service") updateCmd.Flags().Bool("force", false, "force tasks to restart even if nothing has changed") flagparser.AddServiceFlags(updateCmd.Flags()) }