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

Fixes LCOW after containerd 1.0 introduced regressions
Upstream-commit: 2613c3d53cee46d8e0dc8e1aba83686f259985e4
Component: engine
This commit is contained in:
Kenfe-Mickaël Laventure
2017-10-28 09:02:00 +11:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@ -513,7 +513,7 @@ func (c *client) createLinux(id string, spec *specs.Spec, runtimeOptions interfa
ctr := &container{
id: id,
execs: make(map[string]*process),
isWindows: true,
isWindows: false,
ociSpec: spec,
hcsContainer: hcsContainer,
status: StatusCreated,

View File

@ -65,6 +65,7 @@ func DefaultLinuxSpec() specs.Spec {
Effective: defaultCapabilities(),
},
},
Root: &specs.Root{},
}
s.Mounts = []specs.Mount{
{