Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate

LCOW: Updates necessary due to platform schema change
moby · Jun 23, 2017 · 25a65a1 · 25a65a1
2 parents db57b85 + c75db46
commit 25a65a1
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 39 deletions.
diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go
@@ -299,7 +299,9 @@ func (clnt *client) createLinux(containerID string, checkpoint string, checkpoin
 		Owner:         defaultOwner,
 		TerminateOnLastHandleClosed: true,
 		HvRuntime: &hcsshim.HvRuntime{
-			ImagePath: `c:\program files\lcow`,
+			ImagePath:       `c:\program files\lcow`,
+			LinuxKernelFile: `bootx64.efi`,
+			LinuxInitrdFile: `initrd.img`,
 		},
 	}
 

diff --git a/vendor.conf b/vendor.conf
@@ -1,14 +1,14 @@
 # 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
 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
 github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git
 github.com/gorilla/context v1.1
 github.com/gorilla/mux v1.1
-github.com/jhowardmsft/opengcs v0.0.3
+github.com/jhowardmsft/opengcs v0.0.4
 github.com/kr/pty 5cf931ef8f
 github.com/mattn/go-shellwords v1.0.3
 github.com/tchap/go-patricia v2.2.6

diff --git a/vendor/github.com/Microsoft/hcsshim/interface.go b/vendor/github.com/Microsoft/hcsshim/interface.go
diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go b/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go