InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: work around Go 1.6.2/Nano Server TP5 issue

Browse Source 
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
John Starks
2016-05-20 10:38:31 -07:00
committed by Antonio Murdaca
parent f32ccb080a
commit fa82c0aa10
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/docker/docker_windows.go
View File

@@ -1,5 +1,18 @@
package main
import (
"sync/atomic"
_ "github.com/docker/docker/autogen/winresources/docker"
)
//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
var dummy uintptr
func init() {
// Ensure that this import is not removed by the linker. This is used to
// ensure that shell32.dll is loaded by the system loader, preventing
// go#15286 from triggering on Nano Server TP5.
atomic.LoadUintptr(&dummy)
}

13
cmd/dockerd/docker_windows.go
View File

@@ -1,5 +1,18 @@
package main
import (
"sync/atomic"
_ "github.com/docker/docker/autogen/winresources/dockerd"
)
//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
var dummy uintptr
func init() {
// Ensure that this import is not removed by the linker. This is used to
// ensure that shell32.dll is loaded by the system loader, preventing
// go#15286 from triggering on Nano Server TP5.
atomic.LoadUintptr(&dummy)
}