瀏覽代碼

Bump runc

Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff 9 年之前
父節點
當前提交
d9f5f1954c

+ 1 - 1
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

+ 1 - 2
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)

+ 1 - 0
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)
 	}
 

+ 1 - 1
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