Просмотр исходного кода

Merge pull request #38692 from Microsoft/jjh/runtime-spec

Vendor opencontainers/runtime-spec 29686dbc
Akihiro Suda 6 лет назад
Родитель
Сommit
f18cf23e97
2 измененных файлов с 9 добавлено и 5 удалено
  1. 1 1
      vendor.conf
  2. 8 4
      vendor/github.com/opencontainers/runtime-spec/specs-go/config.go

+ 1 - 1
vendor.conf

@@ -79,7 +79,7 @@ google.golang.org/grpc v1.12.0
 # This commit does not need to match RUNC_COMMIT as it is used for helper
 # This commit does not need to match RUNC_COMMIT as it is used for helper
 # packages but should be newer or equal.
 # packages but should be newer or equal.
 github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
 github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
-github.com/opencontainers/runtime-spec 5684b8af48c1ac3b1451fa499724e30e3c20a294 # v1.0.1-49-g5684b8a
+github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
 github.com/opencontainers/image-spec v1.0.1
 github.com/opencontainers/image-spec v1.0.1
 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
 
 

+ 8 - 4
vendor/github.com/opencontainers/runtime-spec/specs-go/config.go

@@ -38,7 +38,9 @@ type Process struct {
 	// User specifies user information for the process.
 	// User specifies user information for the process.
 	User User `json:"user"`
 	User User `json:"user"`
 	// Args specifies the binary and arguments for the application to execute.
 	// Args specifies the binary and arguments for the application to execute.
-	Args []string `json:"args"`
+	Args []string `json:"args,omitempty"`
+	// CommandLine specifies the full command line for the application to execute on Windows.
+	CommandLine string `json:"commandLine,omitempty" platform:"windows"`
 	// Env populates the process environment for the process.
 	// Env populates the process environment for the process.
 	Env []string `json:"env,omitempty"`
 	Env []string `json:"env,omitempty"`
 	// Cwd is the current working directory for the process and must be
 	// Cwd is the current working directory for the process and must be
@@ -528,7 +530,7 @@ type VMHypervisor struct {
 	// Path is the host path to the hypervisor used to manage the virtual machine.
 	// Path is the host path to the hypervisor used to manage the virtual machine.
 	Path string `json:"path"`
 	Path string `json:"path"`
 	// Parameters specifies parameters to pass to the hypervisor.
 	// Parameters specifies parameters to pass to the hypervisor.
-	Parameters string `json:"parameters,omitempty"`
+	Parameters []string `json:"parameters,omitempty"`
 }
 }
 
 
 // VMKernel contains information about the kernel to use for a virtual machine.
 // VMKernel contains information about the kernel to use for a virtual machine.
@@ -536,7 +538,7 @@ type VMKernel struct {
 	// Path is the host path to the kernel used to boot the virtual machine.
 	// Path is the host path to the kernel used to boot the virtual machine.
 	Path string `json:"path"`
 	Path string `json:"path"`
 	// Parameters specifies parameters to pass to the kernel.
 	// Parameters specifies parameters to pass to the kernel.
-	Parameters string `json:"parameters,omitempty"`
+	Parameters []string `json:"parameters,omitempty"`
 	// InitRD is the host path to an initial ramdisk to be used by the kernel.
 	// InitRD is the host path to an initial ramdisk to be used by the kernel.
 	InitRD string `json:"initrd,omitempty"`
 	InitRD string `json:"initrd,omitempty"`
 }
 }
@@ -632,7 +634,9 @@ type LinuxIntelRdt struct {
 	// Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..."
 	// Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..."
 	L3CacheSchema string `json:"l3CacheSchema,omitempty"`
 	L3CacheSchema string `json:"l3CacheSchema,omitempty"`
 
 
-	// The schema of memory bandwidth percentage per L3 cache id
+	// The schema of memory bandwidth per L3 cache id
 	// Format: "MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;..."
 	// Format: "MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;..."
+	// The unit of memory bandwidth is specified in "percentages" by
+	// default, and in "MBps" if MBA Software Controller is enabled.
 	MemBwSchema string `json:"memBwSchema,omitempty"`
 	MemBwSchema string `json:"memBwSchema,omitempty"`
 }
 }