!64 bugfix: fix build-arg can not be properly read

Merge pull request !64 from DCCooper/bugfix

api/services/control.pb.go

@@ -77,7 +77,9 @@ type BuildRequest struct {
 	// capAddList indicates Linux capabilities for RUN command
 	CapAddList []string `protobuf:"bytes,11,rep,name=capAddList,proto3" json:"capAddList,omitempty"`
 	// entityID is an id to descript a physic building
-	EntityID             string   `protobuf:"bytes,12,opt,name=entityID,proto3" json:"entityID,omitempty"`
+	EntityID string `protobuf:"bytes,12,opt,name=entityID,proto3" json:"entityID,omitempty"`
+	// encrypted indicated the build args are encrypted
+	Encrypted            bool     `protobuf:"varint,13,opt,name=encrypted,proto3" json:"encrypted,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -191,6 +193,13 @@ func (m *BuildRequest) GetEntityID() string {
 	return ""
 }
 
+func (m *BuildRequest) GetEncrypted() bool {
+	if m != nil {
+		return m.Encrypted
+	}
+	return false
+}
+
 type ImportRequest struct {
 	// reference is reference of the import image
 	Reference string `protobuf:"bytes,1,opt,name=reference,proto3" json:"reference,omitempty"`
@@ -1524,94 +1533,95 @@ func init() {
 func init() { proto.RegisterFile("api/services/control.proto", fileDescriptor_d71ef680555cb937) }
 
 var fileDescriptor_d71ef680555cb937 = []byte{
-	// 1394 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x5f, 0x73, 0xdb, 0x44,
-	0x10, 0x47, 0x96, 0xe3, 0x24, 0x2b, 0x27, 0xcd, 0x1c, 0x9d, 0xa0, 0x71, 0xd3, 0xd6, 0x88, 0x0e,
-	0x63, 0xca, 0x8c, 0x93, 0x86, 0x3e, 0x50, 0x86, 0x32, 0xe4, 0x4f, 0x5b, 0x4c, 0x5b, 0x67, 0x50,
-	0x42, 0x79, 0xa3, 0x73, 0xb5, 0x2f, 0xca, 0x4d, 0x25, 0x9d, 0xb8, 0x3b, 0xa5, 0x35, 0x7c, 0x08,
-	0x5e, 0x78, 0x61, 0x06, 0x3e, 0x11, 0x5f, 0x80, 0x8f, 0xc3, 0xdc, 0xe9, 0x4e, 0x92, 0x2d, 0xa7,
-	0xe5, 0xed, 0xf6, 0xb7, 0x7f, 0x6e, 0x6f, 0x77, 0x6f, 0x77, 0xa1, 0x87, 0x33, 0xba, 0x2b, 0x08,
-	0xbf, 0xa4, 0x13, 0x22, 0x76, 0x27, 0x2c, 0x95, 0x9c, 0xc5, 0xc3, 0x8c, 0x33, 0xc9, 0xd0, 0x26,
-	0x15, 0x79, 0x8c, 0x87, 0xaf, 0x72, 0x1a, 0x4f, 0x87, 0x97, 0xf7, 0x7a, 0x37, 0x22, 0xc6, 0xa2,
-	0x98, 0xec, 0x6a, 0xee, 0xab, 0xfc, 0x7c, 0x97, 0x24, 0x99, 0x9c, 0x15, 0xc2, 0xbd, 0xdb, 0x8b,
-	0x4c, 0x49, 0x13, 0x22, 0x24, 0x4e, 0xb2, 0x42, 0x20, 0xf8, 0xdd, 0x85, 0xee, 0xa1, 0x32, 0x15,
-	0x92, 0x5f, 0x72, 0x22, 0x24, 0xda, 0x81, 0x75, 0x6d, 0xfa, 0x6c, 0x96, 0x11, 0xdf, 0xe9, 0x3b,
-	0x83, 0xf5, 0xb0, 0x02, 0x90, 0x0f, 0xab, 0x9a, 0x18, 0x1d, 0xfb, 0x2d, 0xcd, 0xb3, 0x24, 0xba,
-	0x05, 0xa0, 0xfc, 0x24, 0x6f, 0xe5, 0x31, 0xe5, 0xbe, 0xab, 0x99, 0x35, 0x04, 0xf5, 0xc1, 0x3b,
-	0xa7, 0x31, 0x39, 0x52, 0x48, 0x2a, 0xfd, 0xb6, 0x16, 0xa8, 0x43, 0x68, 0x1b, 0x3a, 0x2c, 0x97,
-	0x59, 0x2e, 0xfd, 0x15, 0xcd, 0x34, 0x54, 0xe9, 0xd1, 0x01, 0x8f, 0x84, 0xdf, 0xe9, 0xbb, 0xa5,
-	0x47, 0x0a, 0x40, 0xd7, 0x61, 0x25, 0xe3, 0xec, 0xed, 0xcc, 0x5f, 0xed, 0x3b, 0x83, 0xb5, 0xb0,
-	0x20, 0x94, 0x9f, 0x94, 0x4e, 0x95, 0x75, 0x7f, 0xad, 0xf0, 0xd3, 0x90, 0xe8, 0x21, 0x78, 0x5a,
-	0xf9, 0x54, 0x62, 0x49, 0x27, 0xfe, 0x7a, 0xdf, 0x19, 0x78, 0xfb, 0x37, 0x86, 0xf3, 0x41, 0x1d,
-	0x1e, 0x56, 0x22, 0x61, 0x5d, 0x1e, 0xdd, 0x81, 0x0d, 0x3c, 0x9d, 0x52, 0x49, 0x59, 0x8a, 0xe3,
-	0x33, 0x1c, 0xf9, 0xa0, 0xcd, 0xcf, 0x83, 0x3a, 0x18, 0x38, 0x3b, 0x98, 0x4e, 0x9f, 0x51, 0x21,
-	0x7d, 0x4f, 0xfb, 0x5c, 0x43, 0x50, 0x0f, 0xd6, 0x48, 0x2a, 0xa9, 0x9c, 0x8d, 0x8e, 0xfd, 0xae,
-	0x36, 0x50, 0xd2, 0xc1, 0x01, 0x6c, 0x8c, 0x92, 0x8c, 0x71, 0x59, 0xcb, 0x08, 0x27, 0xe7, 0x84,
-	0x93, 0x74, 0x52, 0x66, 0xa4, 0x04, 0x10, 0x82, 0xf6, 0x14, 0x4b, 0xac, 0xd3, 0xd1, 0x0d, 0xf5,
-	0x39, 0x08, 0x60, 0xd3, 0x9a, 0x10, 0x19, 0x4b, 0x05, 0x41, 0x5b, 0xe0, 0xc6, 0x2c, 0x32, 0xda,
-	0xea, 0x18, 0x3c, 0x01, 0xaf, 0xf6, 0x48, 0xf4, 0xa5, 0x4d, 0x3b, 0x4d, 0x8a, 0x4b, 0xbc, 0xfd,
-	0xde, 0xb0, 0x28, 0x9e, 0xa1, 0x2d, 0x9e, 0xe1, 0x99, 0x2d, 0x9e, 0xb0, 0x12, 0x0e, 0x1e, 0xc2,
-	0x86, 0x29, 0x20, 0x73, 0x97, 0x8a, 0x7d, 0x82, 0x23, 0x32, 0x3a, 0x36, 0xf7, 0x59, 0x72, 0xa9,
-	0xaf, 0x9f, 0xc1, 0x86, 0x72, 0x21, 0x17, 0xf6, 0xb9, 0xb5, 0x12, 0x73, 0xe6, 0x4a, 0x2c, 0xb8,
-	0x0b, 0x9b, 0x56, 0xb4, 0xba, 0x6a, 0x62, 0x0a, 0xca, 0xc8, 0x1a, 0x32, 0xf8, 0x1c, 0x3c, 0x15,
-	0xe9, 0x5a, 0x0c, 0xb5, 0x13, 0x63, 0x9c, 0x94, 0x31, 0x2c, 0x81, 0xe0, 0x3e, 0xc0, 0x19, 0x8e,
-	0xac, 0xec, 0x75, 0x58, 0xd1, 0x2c, 0x23, 0x57, 0x10, 0x2a, 0x82, 0x12, 0x47, 0xa6, 0xea, 0xd5,
-	0x31, 0xf8, 0xc7, 0x81, 0x6e, 0x71, 0x87, 0xf1, 0xe6, 0x1b, 0xe8, 0x68, 0x59, 0xe1, 0x3b, 0x7d,
-	0x77, 0xe0, 0xed, 0x7f, 0xba, 0x58, 0x55, 0x75, 0xe9, 0xe1, 0x48, 0x07, 0x25, 0x3d, 0x67, 0xa1,
-	0xd1, 0xea, 0xfd, 0x06, 0xeb, 0x25, 0xa8, 0x4a, 0x88, 0x93, 0x8c, 0x09, 0x2a, 0x19, 0x9f, 0x19,
-	0x57, 0x6a, 0x48, 0xd3, 0x1f, 0xb4, 0x09, 0x2d, 0x3a, 0x35, 0x3f, 0xaf, 0x45, 0xa7, 0x3a, 0x38,
-	0x9c, 0x60, 0x49, 0xa6, 0xe6, 0xb7, 0x59, 0x52, 0xe5, 0x41, 0xd0, 0x5f, 0x89, 0xf9, 0x67, 0xfa,
-	0x1c, 0xfc, 0xed, 0xc0, 0xb5, 0x17, 0x84, 0x0b, 0xca, 0xd2, 0x7a, 0x78, 0x2f, 0x0b, 0xc8, 0x86,
-	0xd7, 0x90, 0x2a, 0x9e, 0x11, 0x33, 0xe2, 0xc6, 0x87, 0x0a, 0xd0, 0x5c, 0x2a, 0x8f, 0x58, 0x92,
-	0x50, 0x69, 0x1c, 0xaa, 0x80, 0xaa, 0xc3, 0xa8, 0x52, 0x6b, 0xd7, 0x3b, 0x0c, 0x4d, 0x88, 0xee,
-	0x02, 0xe2, 0x80, 0x4f, 0x2e, 0xca, 0x2e, 0xa0, 0xa9, 0xe0, 0x07, 0xd8, 0x08, 0x49, 0xc2, 0x2e,
-	0x49, 0xad, 0x4e, 0xaa, 0x32, 0x73, 0xeb, 0x65, 0xb6, 0x05, 0x2e, 0x8e, 0x63, 0xed, 0xd6, 0x5a,
-	0xa8, 0x8e, 0x45, 0x93, 0xc8, 0x53, 0xa2, 0x9d, 0xd1, 0x4d, 0x22, 0x4f, 0x55, 0xda, 0x37, 0xad,
-	0x49, 0xf3, 0xe0, 0x00, 0xba, 0x31, 0x9e, 0x11, 0xfe, 0x9c, 0x08, 0x51, 0x55, 0xc0, 0x1c, 0x16,
-	0xfc, 0xe5, 0xc0, 0x87, 0xdf, 0x11, 0x1c, 0xcb, 0x8b, 0xa3, 0x0b, 0x32, 0x79, 0x5d, 0xea, 0x8e,
-	0xa0, 0x23, 0x74, 0x75, 0x6a, 0xad, 0xcd, 0xfd, 0x7b, 0x8b, 0xd9, 0x5f, 0xa2, 0x34, 0x3c, 0x55,
-	0x3d, 0x3e, 0x8d, 0x4c, 0x59, 0x1b, 0x03, 0xc1, 0x57, 0xb0, 0x31, 0xc7, 0x40, 0x1e, 0xac, 0xfe,
-	0x38, 0x7e, 0x3a, 0x3e, 0xf9, 0x69, 0xbc, 0xf5, 0x81, 0x22, 0x4e, 0x1f, 0x85, 0x2f, 0x46, 0xe3,
-	0x27, 0x5b, 0x0e, 0xba, 0x06, 0xde, 0xf8, 0xe4, 0xec, 0xa5, 0x05, 0x5a, 0xc1, 0xcf, 0xd0, 0x7d,
-	0xc6, 0x22, 0x9a, 0xda, 0x30, 0x6d, 0x43, 0x47, 0x0d, 0x12, 0xc2, 0xcd, 0x63, 0x0c, 0xa5, 0x5a,
-	0x50, 0x2e, 0x08, 0x4f, 0xd5, 0x87, 0x28, 0x12, 0x58, 0xd2, 0x8a, 0x97, 0x61, 0x21, 0xde, 0x30,
-	0x6e, 0xeb, 0xa9, 0xa4, 0xd5, 0x7f, 0x35, 0xf6, 0xdf, 0xfb, 0x07, 0x1f, 0x68, 0x51, 0x96, 0xcb,
-	0xf7, 0xf9, 0xd2, 0x48, 0x58, 0x30, 0x80, 0x4d, 0xab, 0x6a, 0xae, 0xd9, 0x86, 0x0e, 0x27, 0x22,
-	0x8f, 0xed, 0x2d, 0x86, 0x0a, 0x3e, 0x06, 0xef, 0x19, 0xc3, 0xe5, 0xf8, 0x42, 0xd0, 0xce, 0xb0,
-	0xbc, 0x30, 0x42, 0xfa, 0x1c, 0xf4, 0x55, 0x48, 0xf0, 0xf4, 0x1d, 0xcd, 0xf0, 0x04, 0xbc, 0x53,
-	0x5c, 0x95, 0xd6, 0xf2, 0x0e, 0x60, 0x4d, 0xb7, 0x2a, 0xd3, 0xfa, 0x45, 0xf8, 0x52, 0xd5, 0xa0,
-	0x6b, 0x5e, 0xa4, 0xa9, 0xe0, 0x3e, 0x74, 0x0b, 0x83, 0xe6, 0x4a, 0xdb, 0xf9, 0x9c, 0xaa, 0xf3,
-	0x59, 0x37, 0x5a, 0x95, 0x1b, 0x33, 0x58, 0x7d, 0x4e, 0x92, 0x63, 0xc5, 0xec, 0xc1, 0x5a, 0x42,
-	0x92, 0x33, 0x26, 0x71, 0xac, 0x95, 0xdc, 0xb0, 0xa4, 0x55, 0xc4, 0x13, 0x92, 0x3c, 0xe6, 0xa4,
-	0xc8, 0x9c, 0x1b, 0x5a, 0x52, 0x7d, 0x2d, 0xf1, 0x06, 0x67, 0x85, 0x9a, 0xab, 0x79, 0x15, 0xa0,
-	0x6c, 0x2a, 0x42, 0x2b, 0xb6, 0x0b, 0x9b, 0x96, 0x0e, 0x5e, 0x82, 0x77, 0x2a, 0x19, 0xc7, 0x11,
-	0xd1, 0xd7, 0xdf, 0x81, 0x0d, 0x61, 0x48, 0x4e, 0xab, 0x84, 0xcd, 0x83, 0xe8, 0x2e, 0x6c, 0x19,
-	0xe0, 0x10, 0x4f, 0x5e, 0xd3, 0x34, 0x7a, 0x2c, 0xcc, 0x73, 0x1a, 0x78, 0xf0, 0x87, 0x03, 0xdd,
-	0x90, 0x44, 0x54, 0x48, 0x3e, 0xd3, 0x57, 0xdc, 0x85, 0x2d, 0x5e, 0xd0, 0x94, 0x88, 0x53, 0x82,
-	0xd5, 0x97, 0x2f, 0x3e, 0x72, 0x03, 0x47, 0x43, 0x40, 0x15, 0x36, 0x4a, 0x05, 0x99, 0xe4, 0x5c,
-	0x3d, 0x5e, 0x49, 0x2f, 0xe1, 0xa0, 0x01, 0x5c, 0xab, 0xd0, 0xc3, 0x98, 0x4d, 0x5e, 0xfb, 0xae,
-	0x16, 0x5e, 0x84, 0x83, 0x7f, 0x5b, 0xd0, 0xd5, 0x4d, 0xd8, 0x66, 0xea, 0x9e, 0x0e, 0xae, 0x82,
-	0xcc, 0x18, 0xfc, 0x68, 0xf1, 0x1f, 0x9b, 0x14, 0x85, 0x56, 0x4e, 0xad, 0x14, 0xe6, 0xb9, 0x5a,
-	0xad, 0xb5, 0x7c, 0xa5, 0xa8, 0x85, 0x37, 0xac, 0xcb, 0xa3, 0x6f, 0xa1, 0x6b, 0xbc, 0x9a, 0x69,
-	0x7d, 0x57, 0xeb, 0xef, 0x2c, 0xea, 0xd7, 0x83, 0x17, 0xce, 0x69, 0xa8, 0xc4, 0xaa, 0x8a, 0x0a,
-	0x19, 0xb3, 0x8b, 0x55, 0x49, 0xab, 0x62, 0xe1, 0x79, 0xaa, 0x59, 0x45, 0x43, 0xb5, 0xa4, 0x9a,
-	0x30, 0x27, 0x47, 0xa3, 0x30, 0x4f, 0xd5, 0x4e, 0xe8, 0x77, 0x8a, 0x09, 0x53, 0x21, 0x8a, 0xaf,
-	0x2f, 0x27, 0x7c, 0x9c, 0x27, 0x7a, 0xbd, 0x72, 0xc3, 0x1a, 0xa2, 0xf8, 0x11, 0x0b, 0x59, 0x2e,
-	0x69, 0x4a, 0x84, 0x5e, 0xb3, 0xdc, 0xb0, 0x86, 0xec, 0xff, 0xb9, 0x0a, 0xab, 0x47, 0xc5, 0xea,
-	0x8a, 0x1e, 0xc3, 0x8a, 0x5e, 0x12, 0xd0, 0xce, 0xd2, 0x4d, 0xcb, 0x7c, 0xbc, 0xde, 0xcd, 0x2b,
-	0xb8, 0x45, 0x6e, 0xf6, 0x1c, 0xd5, 0x64, 0x4d, 0x4b, 0xbc, 0xd9, 0x8c, 0x6f, 0x6d, 0x8b, 0xe8,
-	0xdd, 0xba, 0x8a, 0x5d, 0x9a, 0x3a, 0x80, 0xb6, 0xde, 0xc5, 0x6e, 0x2c, 0x9f, 0xd2, 0x85, 0x99,
-	0x9d, 0x77, 0x8d, 0x70, 0x74, 0x08, 0xab, 0x76, 0xe4, 0x6d, 0x37, 0x96, 0xa5, 0x47, 0x6a, 0x0d,
-	0xef, 0xdd, 0x5e, 0x34, 0xb0, 0x38, 0x63, 0x47, 0xd0, 0x29, 0x86, 0x50, 0xf3, 0x45, 0x73, 0xf3,
-	0xae, 0xf9, 0xa2, 0xf9, 0xd9, 0xb5, 0xe7, 0xa0, 0xef, 0xc1, 0xab, 0xcd, 0x98, 0x2b, 0x5d, 0xfa,
-	0xe4, 0x7f, 0x0c, 0x26, 0x74, 0x0c, 0x2b, 0xba, 0xcd, 0x37, 0x13, 0x56, 0x9f, 0x2e, 0xcd, 0x84,
-	0xcd, 0xcf, 0x86, 0x27, 0xd0, 0x29, 0xda, 0x38, 0x5a, 0x26, 0x58, 0x4d, 0x86, 0xe6, 0xe3, 0x16,
-	0xba, 0xff, 0x11, 0xb4, 0x55, 0x0b, 0x5f, 0x92, 0xac, 0xaa, 0xf7, 0x2f, 0x49, 0x56, 0xad, 0xeb,
-	0xef, 0x39, 0xe8, 0x29, 0x74, 0x8a, 0xb5, 0xb8, 0xe9, 0xcd, 0xdc, 0xc6, 0xdd, 0xf4, 0x66, 0x7e,
-	0x9b, 0x1e, 0x38, 0x7b, 0x0e, 0x7a, 0x00, 0xae, 0xda, 0xf4, 0x7b, 0x8b, 0xa2, 0xd5, 0x22, 0xd9,
-	0xbb, 0x22, 0x01, 0xea, 0x31, 0x6a, 0x38, 0x34, 0x1f, 0x53, 0x9b, 0x41, 0xcd, 0xc7, 0xd4, 0xe7,
-	0xc9, 0x9e, 0x83, 0xbe, 0x86, 0xb6, 0xfe, 0xfb, 0x57, 0x65, 0xb9, 0xa1, 0x5f, 0xef, 0x72, 0xaf,
-	0x3a, 0x5a, 0xfa, 0x8b, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x0a, 0xc5, 0xff, 0x69, 0x0e,
+	// 1410 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xef, 0x72, 0xdb, 0x44,
+	0x10, 0x47, 0x96, 0x63, 0x27, 0x2b, 0xdb, 0xcd, 0x1c, 0x9d, 0xa0, 0x71, 0xd3, 0xd6, 0x88, 0x0e,
+	0x63, 0xca, 0x8c, 0x93, 0x86, 0x7e, 0xa0, 0x0c, 0x65, 0xc8, 0x9f, 0xb6, 0x98, 0xb6, 0xce, 0xa0,
+	0x98, 0xf2, 0x8d, 0xce, 0xd5, 0xbe, 0x28, 0x37, 0x95, 0x74, 0xe2, 0xee, 0x94, 0xd6, 0xf0, 0x1a,
+	0x7c, 0x61, 0x06, 0x1e, 0x81, 0x27, 0xe1, 0x05, 0x78, 0x1c, 0xe6, 0x4e, 0xa7, 0x3f, 0xb6, 0x9c,
+	0x96, 0x6f, 0xda, 0xdf, 0xee, 0xed, 0xed, 0xbf, 0xdb, 0x5d, 0x41, 0x1f, 0x27, 0x74, 0x4f, 0x10,
+	0x7e, 0x49, 0x67, 0x44, 0xec, 0xcd, 0x58, 0x2c, 0x39, 0x0b, 0x47, 0x09, 0x67, 0x92, 0xa1, 0x1e,
+	0x15, 0x69, 0x88, 0x47, 0xaf, 0x52, 0x1a, 0xce, 0x47, 0x97, 0xf7, 0xfa, 0x37, 0x02, 0xc6, 0x82,
+	0x90, 0xec, 0x69, 0xee, 0xab, 0xf4, 0x7c, 0x8f, 0x44, 0x89, 0x5c, 0x64, 0xc2, 0xfd, 0xdb, 0xab,
+	0x4c, 0x49, 0x23, 0x22, 0x24, 0x8e, 0x92, 0x4c, 0xc0, 0xfb, 0xdb, 0x86, 0xce, 0x91, 0x52, 0xe5,
+	0x93, 0x5f, 0x52, 0x22, 0x24, 0xda, 0x85, 0x2d, 0xad, 0x7a, 0xba, 0x48, 0x88, 0x6b, 0x0d, 0xac,
+	0xe1, 0x96, 0x5f, 0x02, 0xc8, 0x85, 0xb6, 0x26, 0xc6, 0x27, 0x6e, 0x43, 0xf3, 0x72, 0x12, 0xdd,
+	0x02, 0x50, 0x76, 0x92, 0xb7, 0xf2, 0x84, 0x72, 0xd7, 0xd6, 0xcc, 0x0a, 0x82, 0x06, 0xe0, 0x9c,
+	0xd3, 0x90, 0x1c, 0x2b, 0x24, 0x96, 0x6e, 0x53, 0x0b, 0x54, 0x21, 0xb4, 0x03, 0x2d, 0x96, 0xca,
+	0x24, 0x95, 0xee, 0x86, 0x66, 0x1a, 0xaa, 0xb0, 0xe8, 0x90, 0x07, 0xc2, 0x6d, 0x0d, 0xec, 0xc2,
+	0x22, 0x05, 0xa0, 0xeb, 0xb0, 0x91, 0x70, 0xf6, 0x76, 0xe1, 0xb6, 0x07, 0xd6, 0x70, 0xd3, 0xcf,
+	0x08, 0x65, 0x27, 0xa5, 0x73, 0xa5, 0xdd, 0xdd, 0xcc, 0xec, 0x34, 0x24, 0x7a, 0x08, 0x8e, 0x3e,
+	0x7c, 0x26, 0xb1, 0xa4, 0x33, 0x77, 0x6b, 0x60, 0x0d, 0x9d, 0x83, 0x1b, 0xa3, 0xe5, 0xa0, 0x8e,
+	0x8e, 0x4a, 0x11, 0xbf, 0x2a, 0x8f, 0xee, 0x40, 0x17, 0xcf, 0xe7, 0x54, 0x52, 0x16, 0xe3, 0x70,
+	0x8a, 0x03, 0x17, 0xb4, 0xfa, 0x65, 0x50, 0x07, 0x03, 0x27, 0x87, 0xf3, 0xf9, 0x33, 0x2a, 0xa4,
+	0xeb, 0x68, 0x9b, 0x2b, 0x08, 0xea, 0xc3, 0x26, 0x89, 0x25, 0x95, 0x8b, 0xf1, 0x89, 0xdb, 0xd1,
+	0x0a, 0x0a, 0x5a, 0xb9, 0x4b, 0xe2, 0x19, 0x5f, 0x24, 0x92, 0xcc, 0xdd, 0xae, 0x76, 0xaa, 0x04,
+	0xbc, 0x43, 0xe8, 0x8e, 0xa3, 0x84, 0x71, 0x59, 0xc9, 0x17, 0x27, 0xe7, 0x84, 0x93, 0x78, 0x56,
+	0xe4, 0xab, 0x00, 0x10, 0x82, 0xe6, 0x1c, 0x4b, 0xac, 0x93, 0xd5, 0xf1, 0xf5, 0xb7, 0xe7, 0x41,
+	0x2f, 0x57, 0x21, 0x12, 0x16, 0x0b, 0x82, 0xb6, 0xc1, 0x0e, 0x59, 0x60, 0x4e, 0xab, 0x4f, 0xef,
+	0x09, 0x38, 0x95, 0x10, 0xa0, 0x2f, 0xf3, 0xa2, 0xa0, 0x51, 0x76, 0x89, 0x73, 0xd0, 0x1f, 0x65,
+	0xa5, 0x35, 0xca, 0x4b, 0x6b, 0x34, 0xcd, 0x4b, 0xcb, 0x2f, 0x85, 0xbd, 0x87, 0xd0, 0x35, 0xe5,
+	0x65, 0xee, 0x52, 0x99, 0x89, 0x70, 0x40, 0xc6, 0x27, 0xe6, 0xbe, 0x9c, 0x5c, 0x6b, 0xeb, 0x67,
+	0xd0, 0x55, 0x26, 0xa4, 0x22, 0x77, 0xb7, 0x52, 0x80, 0xd6, 0x52, 0x01, 0x7a, 0x77, 0xa1, 0x97,
+	0x8b, 0x96, 0x57, 0xcd, 0x4c, 0xb9, 0x19, 0x59, 0x43, 0x7a, 0x9f, 0x83, 0xa3, 0xf2, 0x50, 0x89,
+	0xa1, 0x36, 0x62, 0x82, 0xa3, 0x22, 0x86, 0x05, 0xe0, 0xdd, 0x07, 0x98, 0xe2, 0x20, 0x97, 0xbd,
+	0x0e, 0x1b, 0x9a, 0x65, 0xe4, 0x32, 0x42, 0x45, 0x50, 0xe2, 0xc0, 0xbc, 0x09, 0xf5, 0xe9, 0xfd,
+	0x63, 0x41, 0x27, 0xbb, 0xc3, 0x58, 0xf3, 0x0d, 0xb4, 0xb4, 0xac, 0x70, 0xad, 0x81, 0x3d, 0x74,
+	0x0e, 0x3e, 0x5d, 0xad, 0xb9, 0xaa, 0xf4, 0x68, 0xac, 0x83, 0x12, 0x9f, 0x33, 0xdf, 0x9c, 0xea,
+	0xff, 0x06, 0x5b, 0x05, 0xa8, 0x0a, 0x8c, 0x93, 0x84, 0x09, 0x2a, 0x19, 0x5f, 0x18, 0x53, 0x2a,
+	0x48, 0xdd, 0x1e, 0xd4, 0x83, 0x06, 0x9d, 0x9b, 0x77, 0xd9, 0xa0, 0x73, 0x1d, 0x1c, 0x4e, 0xb0,
+	0x2a, 0xb2, 0xa6, 0x09, 0x4e, 0x46, 0xaa, 0x3c, 0x08, 0xfa, 0x2b, 0x31, 0xaf, 0x50, 0x7f, 0x7b,
+	0x7f, 0x59, 0x70, 0xed, 0x05, 0xe1, 0x82, 0xb2, 0xb8, 0x1a, 0xde, 0xcb, 0x0c, 0xca, 0xc3, 0x6b,
+	0x48, 0x15, 0xcf, 0x80, 0x19, 0x71, 0x63, 0x43, 0x09, 0x68, 0x2e, 0x95, 0xc7, 0x2c, 0x8a, 0xa8,
+	0x34, 0x06, 0x95, 0x40, 0xd9, 0x7f, 0x54, 0xa9, 0x35, 0xab, 0xfd, 0x87, 0x46, 0x44, 0xf7, 0x08,
+	0x71, 0xc8, 0x67, 0x17, 0x45, 0x8f, 0xd0, 0x94, 0xf7, 0x03, 0x74, 0x7d, 0x12, 0xb1, 0x4b, 0x52,
+	0xa9, 0x93, 0xb2, 0xcc, 0xec, 0x6a, 0x99, 0x6d, 0x83, 0x8d, 0xc3, 0x50, 0x9b, 0xb5, 0xe9, 0xab,
+	0xcf, 0xac, 0x85, 0xa4, 0x31, 0xd1, 0xc6, 0xe8, 0x16, 0x92, 0xc6, 0x2a, 0xed, 0xbd, 0x5c, 0xa5,
+	0x71, 0xd8, 0x83, 0x4e, 0x88, 0x17, 0x84, 0x3f, 0x27, 0x42, 0x94, 0x15, 0xb0, 0x84, 0x79, 0x7f,
+	0x5a, 0xf0, 0xe1, 0x77, 0x04, 0x87, 0xf2, 0xe2, 0xf8, 0x82, 0xcc, 0x5e, 0x17, 0x67, 0xc7, 0xd0,
+	0x12, 0xba, 0x3a, 0xf5, 0xa9, 0xde, 0xc1, 0xbd, 0xd5, 0xec, 0xaf, 0x39, 0x34, 0x3a, 0x53, 0x13,
+	0x20, 0x0e, 0x4c, 0x59, 0x1b, 0x05, 0xde, 0x57, 0xd0, 0x5d, 0x62, 0x20, 0x07, 0xda, 0x3f, 0x4e,
+	0x9e, 0x4e, 0x4e, 0x7f, 0x9a, 0x6c, 0x7f, 0xa0, 0x88, 0xb3, 0x47, 0xfe, 0x8b, 0xf1, 0xe4, 0xc9,
+	0xb6, 0x85, 0xae, 0x81, 0x33, 0x39, 0x9d, 0xbe, 0xcc, 0x81, 0x86, 0xf7, 0x33, 0x74, 0x9e, 0xb1,
+	0x80, 0xc6, 0x79, 0x98, 0x76, 0xa0, 0xa5, 0xc6, 0x0c, 0xe1, 0xc6, 0x19, 0x43, 0xa9, 0x06, 0x95,
+	0x0a, 0xc2, 0x63, 0xf5, 0x20, 0xb2, 0x04, 0x16, 0xb4, 0xe2, 0x25, 0x58, 0x88, 0x37, 0x8c, 0xe7,
+	0xf5, 0x54, 0xd0, 0xea, 0xbd, 0x1a, 0xfd, 0xef, 0x7d, 0x83, 0x0f, 0xb4, 0x28, 0x4b, 0xe5, 0xfb,
+	0x6c, 0xa9, 0x25, 0xcc, 0x1b, 0x42, 0x2f, 0x3f, 0x6a, 0xae, 0xd9, 0x81, 0x16, 0x27, 0x22, 0x0d,
+	0xf3, 0x5b, 0x0c, 0xe5, 0x7d, 0x0c, 0xce, 0x33, 0x86, 0x8b, 0xe1, 0x86, 0xa0, 0x99, 0x60, 0x79,
+	0x61, 0x84, 0xf4, 0xb7, 0x37, 0x50, 0x21, 0xc1, 0xf3, 0x77, 0x34, 0xc3, 0x53, 0x70, 0xce, 0x70,
+	0x59, 0x5a, 0xeb, 0x3b, 0x40, 0xae, 0xba, 0x51, 0xaa, 0xd6, 0x1e, 0xe1, 0x4b, 0x55, 0x83, 0xb6,
+	0xf1, 0x48, 0x53, 0xde, 0x7d, 0xe8, 0x64, 0x0a, 0xcd, 0x95, 0x79, 0xe7, 0xb3, 0xca, 0xce, 0x97,
+	0x9b, 0xd1, 0x28, 0xcd, 0x58, 0x40, 0xfb, 0x39, 0x89, 0x4e, 0x14, 0xb3, 0x0f, 0x9b, 0x11, 0x89,
+	0xa6, 0x4c, 0xe2, 0x50, 0x1f, 0xb2, 0xfd, 0x82, 0x56, 0x11, 0x8f, 0x48, 0xf4, 0x98, 0x93, 0x2c,
+	0x73, 0xb6, 0x9f, 0x93, 0xea, 0x69, 0x89, 0x37, 0x38, 0xc9, 0x8e, 0xd9, 0x9a, 0x57, 0x02, 0x4a,
+	0xa7, 0x22, 0xf4, 0xc1, 0x66, 0xa6, 0x33, 0xa7, 0xbd, 0x97, 0xe0, 0x9c, 0x49, 0xc6, 0x71, 0x40,
+	0xf4, 0xf5, 0x77, 0xa0, 0x2b, 0x0c, 0xc9, 0x69, 0x99, 0xb0, 0x65, 0x10, 0xdd, 0x85, 0x6d, 0x03,
+	0x1c, 0xe1, 0xd9, 0x6b, 0x1a, 0x07, 0x8f, 0x85, 0x71, 0xa7, 0x86, 0x7b, 0xbf, 0x5b, 0xd0, 0xf1,
+	0x49, 0x40, 0x85, 0xe4, 0x0b, 0x7d, 0xc5, 0x5d, 0xd8, 0xe6, 0x19, 0x4d, 0x89, 0x38, 0x23, 0x58,
+	0x3d, 0xf9, 0xec, 0x21, 0xd7, 0x70, 0x34, 0x02, 0x54, 0x62, 0xe3, 0x58, 0x90, 0x59, 0xca, 0x95,
+	0xf3, 0x4a, 0x7a, 0x0d, 0x07, 0x0d, 0xe1, 0x5a, 0x89, 0x1e, 0x85, 0x6c, 0xf6, 0xda, 0xb5, 0xb5,
+	0xf0, 0x2a, 0xec, 0xfd, 0xdb, 0x80, 0x8e, 0x6e, 0xc2, 0x79, 0xa6, 0xee, 0xe9, 0xe0, 0x2a, 0xc8,
+	0x8c, 0xc1, 0x8f, 0x56, 0xdf, 0xb1, 0x49, 0x91, 0x9f, 0xcb, 0xa9, 0x85, 0xc3, 0xb8, 0xab, 0x8f,
+	0x35, 0xd6, 0x2f, 0x1c, 0x95, 0xf0, 0xfa, 0x55, 0x79, 0xf4, 0x2d, 0x74, 0x8c, 0x55, 0x0b, 0x7d,
+	0xde, 0xd6, 0xe7, 0x77, 0x57, 0xcf, 0x57, 0x83, 0xe7, 0x2f, 0x9d, 0x50, 0x89, 0x55, 0x15, 0xe5,
+	0x33, 0x96, 0xaf, 0x5d, 0x05, 0xad, 0x8a, 0x85, 0xa7, 0xb1, 0x66, 0x65, 0x0d, 0x35, 0x27, 0xd5,
+	0x84, 0x39, 0x3d, 0x1e, 0xfb, 0x69, 0xac, 0x36, 0x46, 0xb7, 0x95, 0x4d, 0x98, 0x12, 0x51, 0x7c,
+	0x7d, 0x39, 0xe1, 0x93, 0x34, 0xd2, 0xcb, 0x97, 0xed, 0x57, 0x10, 0xc5, 0x0f, 0x98, 0xcf, 0x52,
+	0x49, 0x63, 0x22, 0xf4, 0x12, 0x66, 0xfb, 0x15, 0xe4, 0xe0, 0x8f, 0x36, 0xb4, 0x8f, 0xb3, 0xc5,
+	0x16, 0x3d, 0x86, 0x0d, 0xbd, 0x24, 0xa0, 0xdd, 0xb5, 0x7b, 0x98, 0x79, 0x78, 0xfd, 0x9b, 0x57,
+	0x70, 0xb3, 0xdc, 0xec, 0x5b, 0xaa, 0xc9, 0x9a, 0x96, 0x78, 0xb3, 0x1e, 0xdf, 0xca, 0x16, 0xd1,
+	0xbf, 0x75, 0x15, 0xbb, 0x50, 0x75, 0x08, 0x4d, 0xbd, 0xa9, 0xdd, 0x58, 0x3f, 0xa5, 0x33, 0x35,
+	0xbb, 0xef, 0x1a, 0xe1, 0xe8, 0x08, 0xda, 0xf9, 0xc8, 0xdb, 0xa9, 0x2d, 0x4b, 0x8f, 0xd4, 0x92,
+	0xde, 0xbf, 0xbd, 0xaa, 0x60, 0x75, 0xc6, 0x8e, 0xa1, 0x95, 0x0d, 0xa1, 0xba, 0x47, 0x4b, 0xf3,
+	0xae, 0xee, 0xd1, 0xf2, 0xec, 0xda, 0xb7, 0xd0, 0xf7, 0xe0, 0x54, 0x66, 0xcc, 0x95, 0x26, 0x7d,
+	0xf2, 0x3f, 0x06, 0x13, 0x3a, 0x81, 0x0d, 0xdd, 0xe6, 0xeb, 0x09, 0xab, 0x4e, 0x97, 0x7a, 0xc2,
+	0x96, 0x67, 0xc3, 0x13, 0x68, 0x65, 0x6d, 0x1c, 0xad, 0x13, 0x2c, 0x27, 0x43, 0xdd, 0xb9, 0x95,
+	0xee, 0x7f, 0x0c, 0x4d, 0xd5, 0xc2, 0xd7, 0x24, 0xab, 0xec, 0xfd, 0x6b, 0x92, 0x55, 0xe9, 0xfa,
+	0xfb, 0x16, 0x7a, 0x0a, 0xad, 0x6c, 0x2d, 0xae, 0x5b, 0xb3, 0xb4, 0x71, 0xd7, 0xad, 0x59, 0xde,
+	0xa6, 0x87, 0xd6, 0xbe, 0x85, 0x1e, 0x80, 0xad, 0xfe, 0x03, 0xfa, 0xab, 0xa2, 0xe5, 0x22, 0xd9,
+	0xbf, 0x22, 0x01, 0xca, 0x19, 0x35, 0x1c, 0xea, 0xce, 0x54, 0x66, 0x50, 0xdd, 0x99, 0xea, 0x3c,
+	0xd9, 0xb7, 0xd0, 0xd7, 0xd0, 0xd4, 0x6f, 0xff, 0xaa, 0x2c, 0xd7, 0xce, 0x57, 0xbb, 0xdc, 0xab,
+	0x96, 0x96, 0xfe, 0xe2, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xbf, 0x3d, 0x15, 0x87, 0x0e,
 	0x00, 0x00,
 }
 

api/services/control.proto

@@ -71,6 +71,8 @@ message BuildRequest {
     repeated string capAddList = 11;
     // entityID is an id to descript a physic building
     string entityID = 12;
+    // encrypted indicated the build args are encrypted
+    bool encrypted = 13;
 }
 
 message ImportRequest {

builder/dockerfile/builder.go

@@ -100,7 +100,7 @@ func NewBuilder(ctx context.Context, store store.Store, req *pb.BuildRequest, ru
 		rsaKey:       key,
 	}
 
-	args, err := b.parseBuildArgs(req.GetBuildArgs())
+	args, err := b.parseBuildArgs(req.GetBuildArgs(), req.GetEncrypted())
 	if err != nil {
 		return nil, errors.Wrap(err, "parse build-arg failed")
 	}
@@ -193,11 +193,10 @@ func (b *Builder) Logger() *logrus.Entry {
 	return logrus.WithField(util.LogKeySessionID, b.ctx.Value(util.LogFieldKey(util.LogKeySessionID)))
 }
 
-func (b *Builder) parseBuildArgs(buildArgs []string) (map[string]string, error) {
+func (b *Builder) parseBuildArgs(buildArgs []string, encrypted bool) (map[string]string, error) {
 	args := make(map[string]string, len(buildArgs))
-	errKey := b.rsaKey.Validate()
 	for _, arg := range buildArgs {
-		if errKey == nil {
+		if encrypted {
 			v, err := util.DecryptRSA(arg, b.rsaKey, crypto.SHA512)
 			if err != nil {
 				return nil, err

builder/dockerfile/builder_test.go

@@ -1238,11 +1238,11 @@ func TestParseRequestBuildArgs(t *testing.T) {
 					assert.NilError(t, encErr)
 					args = append(args, encryptedArg)
 				}
-				argsParsed, err = b.parseBuildArgs(args)
+				argsParsed, err = b.parseBuildArgs(args, tt.decrypt)
 				b.buildOpts.BuildArgs = argsParsed
 			} else {
 				b.rsaKey = &rsa.PrivateKey{}
-				argsParsed, err = b.parseBuildArgs(tt.buildArgs)
+				argsParsed, err = b.parseBuildArgs(tt.buildArgs, tt.decrypt)
 				b.buildOpts.BuildArgs = argsParsed
 			}
 

cmd/cli/build.go

@@ -266,6 +266,7 @@ func parseStaticBuildOpts() (*pb.BuildStatic, time.Time, error) {
 func runBuild(ctx context.Context, cli Cli) (string, error) {
 	var (
 		isIsulad        bool
+		encrypted       bool
 		buildResp       *pb.BuildResponse
 		err             error
 		content         string
@@ -287,7 +288,7 @@ func runBuild(ctx context.Context, cli Cli) (string, error) {
 	if content, digest, err = readDockerfile(); err != nil {
 		return "", err
 	}
-	if err = encryptBuildArgs(util.DefaultRSAKeyPath); err != nil {
+	if encrypted, err = encryptBuildArgs(util.DefaultRSAKeyPath); err != nil {
 		return "", errors.Wrap(err, "encrypt --build-arg failed")
 	}
 	imageIDFilePath, err = getAbsPath(buildOpts.imageIDFile)
@@ -315,6 +316,7 @@ func runBuild(ctx context.Context, cli Cli) (string, error) {
 		BuildStatic:   buildStatic,
 		Iidfile:       buildOpts.imageIDFile,
 		AdditionalTag: buildOpts.additionalTag,
+		Encrypted:     encrypted,
 	})
 	if err != nil {
 		return "", err
@@ -358,7 +360,7 @@ func runBuild(ctx context.Context, cli Cli) (string, error) {
 }
 
 // encrypts those sensitive args before transporting via GRPC
-func encryptBuildArgs(path string) error {
+func encryptBuildArgs(path string) (bool, error) {
 	var hasSensiArg bool
 	for _, v := range buildOpts.buildArgs {
 		const kvNums = 2
@@ -370,12 +372,12 @@ func encryptBuildArgs(path string) error {
 		}
 	}
 	if !hasSensiArg {
-		return nil
+		return hasSensiArg, nil
 	}
 
 	key, err := util.ReadPublicKey(path)
 	if err != nil {
-		return err
+		return hasSensiArg, err
 	}
 
 	const possibleArgCaps = 10
@@ -383,13 +385,13 @@ func encryptBuildArgs(path string) error {
 	for _, v := range buildOpts.buildArgs {
 		encryptedArg, encErr := util.EncryptRSA(v, key, sha512.New())
 		if encErr != nil {
-			return encErr
+			return hasSensiArg, encErr
 		}
 		args = append(args, encryptedArg)
 	}
 
 	buildOpts.buildArgs = args
-	return nil
+	return hasSensiArg, nil
 }
 
 func runStatus(ctx context.Context, cli Cli) error {

cmd/cli/build_test.go

@@ -511,7 +511,7 @@ func TestEncryptBuildArgs(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			buildOpts.buildArgs = tt.args
 			buildOpts.encryptKey = ""
-			if err := encryptBuildArgs(keyPath); (err == nil) != (!tt.err) {
+			if _, err := encryptBuildArgs(keyPath); (err == nil) != (!tt.err) {
 				t.FailNow()
 			}
 			if tt.encrypt {

runner/runner_test.go

@@ -132,7 +132,7 @@ func TestRunnerRun(t *testing.T) {
 	runner := NewOCIRunner(&OCIRunOpts{
 		Ctx:         context.Background(),
 		Spec:        spec,
-		RuntimePath: "",
+		RuntimePath: "/aaaaa",
 		BundlePath:  bundlePath,
 		NoPivot:     false,
 		Output:      cliLog,