beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27747 from Microsoft/jjh/clientisolationcomment

Browse source 
Windows: Add comment for containers on client SKUs
This commit is contained in:
John Howard 2016-10-25 13:37:25 -07:00 committed by GitHub
commit ff6db320f8
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon_windows.go
View file

@ -496,6 +496,8 @@ func (daemon *Daemon) setDefaultIsolation() error {
}
if containertypes.Isolation(val).IsProcess() {
if system.IsWindowsClient() {
// @engine maintainers. This block should not be removed. It partially enforces licensing
// restrictions on Windows. Ping @jhowardmsft if there are concerns or PRs to change this.
return fmt.Errorf("Windows client operating systems only support Hyper-V containers")
}
daemon.defaultIsolation = containertypes.Isolation("process")

2
pkg/system/syscall_windows.go
View file

@ -53,6 +53,8 @@ func GetOSVersion() OSVersion {
}
// IsWindowsClient returns true if the SKU is client
// @engine maintainers - this function should not be removed or modified as it
// is used to enforce licensing restrictions on Windows.
func IsWindowsClient() bool {
osviex := &osVersionInfoEx{OSVersionInfoSize: 284}
r1, _, err := procGetVersionExW.Call(uintptr(unsafe.Pointer(osviex)))