diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2017-10-05 02:16:02 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2017-10-25 17:26:25 +0200 |
| commit | f864421ead7db42335544b8870edad903fd70ca4 (patch) | |
| tree | 00f304e05cd28b7ff7aaf34118ffd329f526b0cd /libnetwork/cmd | |
| parent | b4856717b9dc0b3462664bf59408696993624ef8 (diff) | |
| download | docker-f864421ead7db42335544b8870edad903fd70ca4.tar.gz | |
bump docker/docker to master and unfork dependencies
This patch updates all dependencies to match what is
used in moby/moby. Making the dependencies match
what is used in that repository makes sure we test
with the same version as libnetwork is later built
with in moby.
This also gets rid of some temporary forks that were
needed during the migration of Sirupsen/logrus to
sirupsen/logrus.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'libnetwork/cmd')
| -rw-r--r-- | libnetwork/cmd/dnet/dnet_windows.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libnetwork/cmd/dnet/dnet_windows.go b/libnetwork/cmd/dnet/dnet_windows.go index 1c31f765df..551528692e 100644 --- a/libnetwork/cmd/dnet/dnet_windows.go +++ b/libnetwork/cmd/dnet/dnet_windows.go @@ -3,24 +3,23 @@ package main import ( "fmt" "os" - "syscall" "github.com/docker/docker/pkg/signal" - "github.com/docker/docker/pkg/system" "github.com/sirupsen/logrus" + "golang.org/x/sys/windows" ) // Copied over from docker/daemon/debugtrap_windows.go func setupDumpStackTrap() { go func() { - sa := syscall.SecurityAttributes{ + sa := windows.SecurityAttributes{ Length: 0, } - ev := "Global\\docker-daemon-" + fmt.Sprint(os.Getpid()) - if h, _ := system.CreateEvent(&sa, false, false, ev); h != 0 { + ev, _ := windows.UTF16PtrFromString("Global\\docker-daemon-" + fmt.Sprint(os.Getpid())) + if h, _ := windows.CreateEvent(&sa, 0, 0, ev); h != 0 { logrus.Debugf("Stackdump - waiting signal at %s", ev) for { - syscall.WaitForSingleObject(h, syscall.INFINITE) + windows.WaitForSingleObject(h, windows.INFINITE) signal.DumpStacks("") } } |