Browse Source

Vendor Microsoft/hcsshim v0.5.25

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 8 years ago
parent
commit
9508c605d8
2 changed files with 4 additions and 3 deletions
  1. 1 1
      vendor.conf
  2. 3 2
      vendor/github.com/Microsoft/hcsshim/interface.go

+ 1 - 1
vendor.conf

@@ -1,6 +1,6 @@
 # the following lines are in sorted order, FYI
 github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
-github.com/Microsoft/hcsshim v0.5.23
+github.com/Microsoft/hcsshim v0.5.25
 github.com/Microsoft/go-winio v0.4.2
 github.com/Sirupsen/logrus v0.11.0
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76

+ 3 - 2
vendor/github.com/Microsoft/hcsshim/interface.go

@@ -11,6 +11,7 @@ import (
 type ProcessConfig struct {
 	ApplicationName   string            `json:",omitempty"`
 	CommandLine       string            `json:",omitempty"`
+	CommandArgs       []string          `json:",omitempty"` // Used by Linux Containers on Windows
 	User              string            `json:",omitempty"`
 	WorkingDirectory  string            `json:",omitempty"`
 	Environment       map[string]string `json:",omitempty"`
@@ -39,8 +40,8 @@ type MappedDir struct {
 type HvRuntime struct {
 	ImagePath       string `json:",omitempty"`
 	SkipTemplate    bool   `json:",omitempty"`
-	LinuxInitrdPath string `json:",omitempty"` // Host path to an initrd image for starting a Linux utility VM
-	LinuxKernelPath string `json:",omitempty"` // Host path to kernel for starting a Linux utility VM
+	LinuxInitrdFile string `json:",omitempty"` // File under ImagePath on host containing an initrd image for starting a Linux utility VM
+	LinuxKernelFile string `json:",omitempty"` // File under ImagePath on host containing a kernel for starting a Linux utility VM
 }
 
 type MappedVirtualDisk struct {