mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #26965 from Microsoft/jjh/rootpath
Windows: Set correct root path logic
This commit is contained in:
commit
15fb3fd9da
1 changed files with 13 additions and 3 deletions
|
@ -64,9 +64,19 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
|
||||||
s.Process.Terminal = c.Config.Tty
|
s.Process.Terminal = c.Config.Tty
|
||||||
s.Process.User.Username = c.Config.User
|
s.Process.User.Username = c.Config.User
|
||||||
|
|
||||||
// In spec.Root
|
// In spec.Root. This is not set for Hyper-V containers
|
||||||
s.Root.Path = c.BaseFS
|
isHyperV := false
|
||||||
s.Root.Readonly = c.HostConfig.ReadonlyRootfs
|
if c.HostConfig.Isolation.IsDefault() {
|
||||||
|
// Container using default isolation, so take the default from the daemon configuration
|
||||||
|
isHyperV = daemon.defaultIsolation.IsHyperV()
|
||||||
|
} else {
|
||||||
|
// Container may be requesting an explicit isolation mode.
|
||||||
|
isHyperV = c.HostConfig.Isolation.IsHyperV()
|
||||||
|
}
|
||||||
|
if !isHyperV {
|
||||||
|
s.Root.Path = c.BaseFS
|
||||||
|
}
|
||||||
|
s.Root.Readonly = false // Windows does not support a read-only root filesystem
|
||||||
|
|
||||||
// In s.Windows.Resources
|
// In s.Windows.Resources
|
||||||
// @darrenstahlmsft implement these resources
|
// @darrenstahlmsft implement these resources
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue