kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #16862 from cpuguy83/bump_runc

Browse source 
Bump runc
This commit is contained in:
Arnaud Porterie 2015-10-08 19:09:47 -07:00
commit e7ef8633d5
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/vendor.sh
View file

@ -44,7 +44,7 @@ clone git github.com/endophage/gotuf 9bcdad0308e34a49f38448b8ad436ad8860825ce
clone git github.com/jfrazelle/go 6e461eb70cb4187b41a84e9a567d7137bdbe0f16 clone git github.com/jfrazelle/go 6e461eb70cb4187b41a84e9a567d7137bdbe0f16
clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c 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) # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
clone git github.com/coreos/go-systemd v3 clone git github.com/coreos/go-systemd v3
clone git github.com/godbus/dbus v2 clone git github.com/godbus/dbus v2

3
integration-cli/docker_cli_exec_test.go
View file

@ -613,9 +613,8 @@ func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) {
} }
// #15750 // #15750
// TODO Fix this test on windows #16738
func (s *DockerSuite) TestExecStartFails(c *check.C) { func (s *DockerSuite) TestExecStartFails(c *check.C) {
testRequires(c, DaemonIsLinux, SameHostDaemon) testRequires(c, DaemonIsLinux)
name := "exec-15750" name := "exec-15750"
dockerCmd(c, "run", "-d", "--name", name, "busybox", "top") dockerCmd(c, "run", "-d", "--name", name, "busybox", "top")
c.Assert(waitRun(name), check.IsNil) c.Assert(waitRun(name), check.IsNil)

1
vendor/src/github.com/opencontainers/runc/libcontainer/process_linux.go vendored
View file

@ -84,6 +84,7 @@ func (p *setnsProcess) start() (err error) {
return newSystemError(err) return newSystemError(err)
} }
if ierr != nil { if ierr != nil {
p.wait()
return newSystemError(ierr) return newSystemError(ierr)
} }

2
vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go vendored
View file

@ -32,7 +32,7 @@ func ConvertStringToOperator(in string) (configs.Operator, error) {
} }
// ConvertStringToAction converts a string into a Seccomp rule match action. // 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 // (notable, SCMP_ACT_TRACE) are not available in this implementation and will
// return errors. // return errors.
// Attempting to convert a string that is not a valid action results in an // Attempting to convert a string that is not a valid action results in an