mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #34468 from Microsoft/jjh/lcowisolation
LCOW: Force Hyper-V Isolation
This commit is contained in:
commit
a63a2e84d8
1 changed files with 14 additions and 3 deletions
|
@ -2,6 +2,7 @@ package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"runtime"
|
||||||
|
|
||||||
containertypes "github.com/docker/docker/api/types/container"
|
containertypes "github.com/docker/docker/api/types/container"
|
||||||
"github.com/docker/docker/container"
|
"github.com/docker/docker/container"
|
||||||
|
@ -11,10 +12,20 @@ import (
|
||||||
|
|
||||||
// createContainerPlatformSpecificSettings performs platform specific container create functionality
|
// createContainerPlatformSpecificSettings performs platform specific container create functionality
|
||||||
func (daemon *Daemon) createContainerPlatformSpecificSettings(container *container.Container, config *containertypes.Config, hostConfig *containertypes.HostConfig) error {
|
func (daemon *Daemon) createContainerPlatformSpecificSettings(container *container.Container, config *containertypes.Config, hostConfig *containertypes.HostConfig) error {
|
||||||
|
|
||||||
|
if container.Platform == runtime.GOOS {
|
||||||
// Make sure the host config has the default daemon isolation if not specified by caller.
|
// Make sure the host config has the default daemon isolation if not specified by caller.
|
||||||
if containertypes.Isolation.IsDefault(containertypes.Isolation(hostConfig.Isolation)) {
|
if containertypes.Isolation.IsDefault(containertypes.Isolation(hostConfig.Isolation)) {
|
||||||
hostConfig.Isolation = daemon.defaultIsolation
|
hostConfig.Isolation = daemon.defaultIsolation
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// LCOW must be a Hyper-V container as you can't run a shared kernel when one
|
||||||
|
// is a Windows kernel, the other is a Linux kernel.
|
||||||
|
if containertypes.Isolation.IsProcess(containertypes.Isolation(hostConfig.Isolation)) {
|
||||||
|
return fmt.Errorf("process isolation is invalid for Linux containers on Windows")
|
||||||
|
}
|
||||||
|
hostConfig.Isolation = "hyperv"
|
||||||
|
}
|
||||||
|
|
||||||
for spec := range config.Volumes {
|
for spec := range config.Volumes {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue