From 9508c605d882a5981a480ab0a07cc9b77568b4d8 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 22 Jun 2017 14:14:38 -0700 Subject: [PATCH] Vendor Microsoft/hcsshim v0.5.25 Signed-off-by: John Howard --- vendor.conf | 2 +- vendor/github.com/Microsoft/hcsshim/interface.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index aae9ba7c8d..e4b1fe1d2c 100644 --- a/vendor.conf +++ b/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 diff --git a/vendor/github.com/Microsoft/hcsshim/interface.go b/vendor/github.com/Microsoft/hcsshim/interface.go index a499fe46a0..5238a641ea 100644 --- a/vendor/github.com/Microsoft/hcsshim/interface.go +++ b/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 {