kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases 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
Show stats 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 package main
import ( import (
"sync/atomic"
_ "github.com/docker/docker/autogen/winresources/docker" _ "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 package main
import ( import (
"sync/atomic"
_ "github.com/docker/docker/autogen/winresources/dockerd" _ "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)
}

2
hack/make.sh
View file

@ -117,7 +117,7 @@ if [ "$AUTO_GOPATH" ]; then
if [ "$(go env GOOS)" = 'solaris' ]; then if [ "$(go env GOOS)" = 'solaris' ]; then
# sys/unix is installed outside the standard library on solaris # sys/unix is installed outside the standard library on solaris
# TODO need to allow for version change, need to get version from go # TODO need to allow for version change, need to get version from go
export GOPATH="${GOPATH}:/usr/lib/gocode/1.5" export GOPATH="${GOPATH}:/usr/lib/gocode/1.6.2"
fi fi
fi fi

7
hack/make/cross
View file

@ -27,13 +27,6 @@ for platform in $DOCKER_CROSSPLATFORMS; do
export GOOS=${platform%/*} export GOOS=${platform%/*}
export GOARCH=${platform##*/} export GOARCH=${platform##*/}
# !!! TEMPORARY HACK !!!
# See Dockerfile
if [ "$platform" == "windows/amd64" ]; then
export GOROOT="/usr/local/go${HACK_GO_VERSION}"
export PATH=$(echo "$PATH" | sed "s,:/usr/local/go/bin:,:/usr/local/go${HACK_GO_VERSION}/bin:,")
fi
if [ -z "${daemonSupporting[$platform]}" ]; then if [ -z "${daemonSupporting[$platform]}" ]; then
# we just need a simple client for these platforms # we just need a simple client for these platforms
export LDFLAGS_STATIC_DOCKER="" export LDFLAGS_STATIC_DOCKER=""