vendor: update docker/docker/pkg/reexec so that it compiles on OpenBSD (#17084)

This commit is contained in:
Fabian Raetz 2018-07-02 13:25:02 +02:00 committed by Péter Szilágyi
parent 8974e2e5e0
commit 223d943481
6 changed files with 18 additions and 16 deletions

View File

@ -1,10 +1,10 @@
// +build linux package reexec // import "github.com/docker/docker/pkg/reexec"
package reexec
import ( import (
"os/exec" "os/exec"
"syscall" "syscall"
"golang.org/x/sys/unix"
) )
// Self returns the path to the current process's binary. // Self returns the path to the current process's binary.
@ -22,7 +22,7 @@ func Command(args ...string) *exec.Cmd {
Path: Self(), Path: Self(),
Args: args, Args: args,
SysProcAttr: &syscall.SysProcAttr{ SysProcAttr: &syscall.SysProcAttr{
Pdeathsig: syscall.SIGTERM, Pdeathsig: unix.SIGTERM,
}, },
} }
} }

View File

@ -1,6 +1,6 @@
// +build freebsd solaris darwin // +build freebsd darwin
package reexec package reexec // import "github.com/docker/docker/pkg/reexec"
import ( import (
"os/exec" "os/exec"

View File

@ -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 ( import (
"os/exec" "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 { func Command(args ...string) *exec.Cmd {
return nil return nil
} }

View File

@ -1,6 +1,4 @@
// +build windows package reexec // import "github.com/docker/docker/pkg/reexec"
package reexec
import ( import (
"os/exec" "os/exec"

View File

@ -1,4 +1,4 @@
package reexec package reexec // import "github.com/docker/docker/pkg/reexec"
import ( import (
"fmt" "fmt"

6
vendor/vendor.json vendored
View File

@ -81,10 +81,10 @@
"revisionTime": "2017-02-01T22:58:49Z" "revisionTime": "2017-02-01T22:58:49Z"
}, },
{ {
"checksumSHA1": "lutCa+IVM60R1OYBm9RtDAW50Ys=", "checksumSHA1": "Ad8LPSCP9HctFrmskh+S5HpHXcs=",
"path": "github.com/docker/docker/pkg/reexec", "path": "github.com/docker/docker/pkg/reexec",
"revision": "83ee902ecc3790c33c1e2d87334074436056bb49", "revision": "8e610b2b55bfd1bfa9436ab110d311f5e8a74dcb",
"revisionTime": "2017-04-22T21:51:12Z" "revisionTime": "2018-06-25T18:44:42Z"
}, },
{ {
"checksumSHA1": "zYnPsNAVm1/ViwCkN++dX2JQhBo=", "checksumSHA1": "zYnPsNAVm1/ViwCkN++dX2JQhBo=",