diff options
| author | Fabian Raetz <fabian.raetz@gmail.com> | 2018-07-02 19:25:02 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-07-02 19:25:02 +0800 |
| commit | 223d943481d16c4874165288cfb68e7350a9104e (patch) | |
| tree | c9b4738838f6ddebf706cc9732675771bbc786f1 | |
| parent | 8974e2e5e04165afc84be7ee8a7a29932875dfa3 (diff) | |
| download | dexon-223d943481d16c4874165288cfb68e7350a9104e.tar.gz dexon-223d943481d16c4874165288cfb68e7350a9104e.tar.zst dexon-223d943481d16c4874165288cfb68e7350a9104e.zip | |
vendor: update docker/docker/pkg/reexec so that it compiles on OpenBSD (#17084)
6 files changed, 18 insertions, 16 deletions
diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_linux.go b/vendor/github.com/docker/docker/pkg/reexec/command_linux.go index 34ae2a9dc..efea71794 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/command_linux.go +++ b/vendor/github.com/docker/docker/pkg/reexec/command_linux.go @@ -1,10 +1,10 @@ -// +build linux - -package reexec +package reexec // import "github.com/docker/docker/pkg/reexec" import ( "os/exec" "syscall" + + "golang.org/x/sys/unix" ) // Self returns the path to the current process's binary. @@ -22,7 +22,7 @@ func Command(args ...string) *exec.Cmd { Path: Self(), Args: args, SysProcAttr: &syscall.SysProcAttr{ - Pdeathsig: syscall.SIGTERM, + Pdeathsig: unix.SIGTERM, }, } } diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_unix.go b/vendor/github.com/docker/docker/pkg/reexec/command_unix.go index 778a720e3..ceaabbdee 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/command_unix.go +++ b/vendor/github.com/docker/docker/pkg/reexec/command_unix.go @@ -1,6 +1,6 @@ -// +build freebsd solaris darwin +// +build freebsd darwin -package reexec +package reexec // import "github.com/docker/docker/pkg/reexec" import ( "os/exec" diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go b/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go index 76edd8242..e7eed2424 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go +++ b/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go @@ -1,12 +1,16 @@ -// +build !linux,!windows,!freebsd,!solaris,!darwin +// +build !linux,!windows,!freebsd,!darwin -package reexec +package reexec // import "github.com/docker/docker/pkg/reexec" import ( "os/exec" ) -// Command is unsupported on operating systems apart from Linux, Windows, Solaris and Darwin. +func Self() string { + return "" +} + +// Command is unsupported on operating systems apart from Linux, Windows, and Darwin. func Command(args ...string) *exec.Cmd { return nil } diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_windows.go b/vendor/github.com/docker/docker/pkg/reexec/command_windows.go index ca871c422..438226890 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/command_windows.go +++ b/vendor/github.com/docker/docker/pkg/reexec/command_windows.go @@ -1,6 +1,4 @@ -// +build windows - -package reexec +package reexec // import "github.com/docker/docker/pkg/reexec" import ( "os/exec" diff --git a/vendor/github.com/docker/docker/pkg/reexec/reexec.go b/vendor/github.com/docker/docker/pkg/reexec/reexec.go index c56671d91..f8ccddd59 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/reexec.go +++ b/vendor/github.com/docker/docker/pkg/reexec/reexec.go @@ -1,4 +1,4 @@ -package reexec +package reexec // import "github.com/docker/docker/pkg/reexec" import ( "fmt" diff --git a/vendor/vendor.json b/vendor/vendor.json index d6a595295..63d138dbd 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -81,10 +81,10 @@ "revisionTime": "2017-02-01T22:58:49Z" }, { - "checksumSHA1": "lutCa+IVM60R1OYBm9RtDAW50Ys=", + "checksumSHA1": "Ad8LPSCP9HctFrmskh+S5HpHXcs=", "path": "github.com/docker/docker/pkg/reexec", - "revision": "83ee902ecc3790c33c1e2d87334074436056bb49", - "revisionTime": "2017-04-22T21:51:12Z" + "revision": "8e610b2b55bfd1bfa9436ab110d311f5e8a74dcb", + "revisionTime": "2018-06-25T18:44:42Z" }, { "checksumSHA1": "zYnPsNAVm1/ViwCkN++dX2JQhBo=", |