commit 2613c3d53cee46d8e0dc8e1aba83686f259985e4
author Kenfe-Mickaël Laventure <mickael.laventure@gmail.com> Sat Oct 28 09:02:00 2017 +1100
committer GitHub <noreply@github.com> Sat Oct 28 09:02:00 2017 +1100
tree 0bda4a09747faa908e4291753357e26d9c0a16fb
parent ecf4125b85e0faa57d2739348e0d453c1d24d10c
parent 71651e0b801ae874b4a899e3c47add9e3fbc2400

Merge pull request #35320 from Microsoft/jjh/lcow-set-oci-root

Fixes LCOW after containerd 1.0 introduced regressions

libcontainerd/client_local_windows.go

diff --git a/libcontainerd/client_local_windows.go b/libcontainerd/client_local_windows.go
index 209b00d..c33e346 100644
--- a/libcontainerd/client_local_windows.go
+++ b/libcontainerd/client_local_windows.go
@@ -513,7 +513,7 @@
 	ctr := &container{
 		id:           id,
 		execs:        make(map[string]*process),
-		isWindows:    true,
+		isWindows:    false,
 		ociSpec:      spec,
 		hcsContainer: hcsContainer,
 		status:       StatusCreated,

oci/defaults.go

diff --git a/oci/defaults.go b/oci/defaults.go
index 667dd41..0cc07ff 100644
--- a/oci/defaults.go
+++ b/oci/defaults.go
@@ -65,6 +65,7 @@
 				Effective:   defaultCapabilities(),
 			},
 		},
+		Root: &specs.Root{},
 	}
 	s.Mounts = []specs.Mount{
 		{