diff --git a/hack/vendor.sh b/hack/vendor.sh index d42b14d613..430acfab42 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -44,7 +44,7 @@ clone git github.com/endophage/gotuf 9bcdad0308e34a49f38448b8ad436ad8860825ce clone git github.com/jfrazelle/go 6e461eb70cb4187b41a84e9a567d7137bdbe0f16 clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c -clone git github.com/opencontainers/runc 902c012e85cdae6bb68d8c7a0df69a42f818ce96 # libcontainer +clone git github.com/opencontainers/runc f152edcb1ca7877dd6e3febddd1b03ad4335e7bb # libcontainer # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json) clone git github.com/coreos/go-systemd v3 clone git github.com/godbus/dbus v2 diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index 619053d9df..f6d1c7eb6e 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -613,9 +613,8 @@ func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) { } // #15750 -// TODO Fix this test on windows #16738 func (s *DockerSuite) TestExecStartFails(c *check.C) { - testRequires(c, DaemonIsLinux, SameHostDaemon) + testRequires(c, DaemonIsLinux) name := "exec-15750" dockerCmd(c, "run", "-d", "--name", name, "busybox", "top") c.Assert(waitRun(name), check.IsNil) diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/process_linux.go b/vendor/src/github.com/opencontainers/runc/libcontainer/process_linux.go index 758f88a421..01021f759b 100644 --- a/vendor/src/github.com/opencontainers/runc/libcontainer/process_linux.go +++ b/vendor/src/github.com/opencontainers/runc/libcontainer/process_linux.go @@ -84,6 +84,7 @@ func (p *setnsProcess) start() (err error) { return newSystemError(err) } if ierr != nil { + p.wait() return newSystemError(ierr) } diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go index 5acf06685c..8bac3357b2 100644 --- a/vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go +++ b/vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go @@ -32,7 +32,7 @@ func ConvertStringToOperator(in string) (configs.Operator, error) { } // ConvertStringToAction converts a string into a Seccomp rule match action. -// Actions use the named they are assigned in Libseccomp's header, though some +// Actions use the names they are assigned in Libseccomp's header, though some // (notable, SCMP_ACT_TRACE) are not available in this implementation and will // return errors. // Attempting to convert a string that is not a valid action results in an