mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
parent
3fe2730ab3
commit
49131f3ad4
4 changed files with 28 additions and 3 deletions
|
@ -3,7 +3,7 @@
|
||||||
TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
|
TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
|
||||||
|
|
||||||
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
|
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
|
||||||
RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
|
RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe
|
||||||
CONTAINERD_COMMIT=665e84e6c28653a9c29a6db601636a92d46896f3
|
CONTAINERD_COMMIT=665e84e6c28653a9c29a6db601636a92d46896f3
|
||||||
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
|
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
|
||||||
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
|
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
|
||||||
|
|
|
@ -61,7 +61,7 @@ github.com/docker/go v1.5.1-1-1-gbaf439e
|
||||||
github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
|
github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
|
||||||
|
|
||||||
# When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
|
# When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
|
||||||
github.com/opencontainers/runc a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 https://github.com/docker/runc.git # libcontainer
|
github.com/opencontainers/runc 54296cf40ad8143b62dbcaa1d90e520a2136ddfe https://github.com/docker/runc.git # libcontainer
|
||||||
github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
|
github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
|
||||||
github.com/seccomp/libseccomp-golang v0.9.0
|
github.com/seccomp/libseccomp-golang v0.9.0
|
||||||
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
|
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
|
||||||
|
|
2
vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
generated
vendored
2
vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
generated
vendored
|
@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount,
|
||||||
if sepIdx == -1 {
|
if sepIdx == -1 {
|
||||||
return nil, fmt.Errorf("invalid mountinfo format")
|
return nil, fmt.Errorf("invalid mountinfo format")
|
||||||
}
|
}
|
||||||
if txt[sepIdx+3:sepIdx+9] != "cgroup" {
|
if txt[sepIdx+3:sepIdx+10] == "cgroup2" || txt[sepIdx+3:sepIdx+9] != "cgroup" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fields := strings.Split(txt, " ")
|
fields := strings.Split(txt, " ")
|
||||||
|
|
25
vendor/github.com/seccomp/libseccomp-golang/README
generated
vendored
25
vendor/github.com/seccomp/libseccomp-golang/README
generated
vendored
|
@ -24,3 +24,28 @@ please note that a Google account is not required to subscribe to the mailing
|
||||||
list.
|
list.
|
||||||
|
|
||||||
-> https://groups.google.com/d/forum/libseccomp
|
-> https://groups.google.com/d/forum/libseccomp
|
||||||
|
|
||||||
|
Documentation is also available at:
|
||||||
|
|
||||||
|
-> https://godoc.org/github.com/seccomp/libseccomp-golang
|
||||||
|
|
||||||
|
* Installing the package
|
||||||
|
|
||||||
|
The libseccomp-golang bindings require at least Go v1.2.1 and GCC v4.8.4;
|
||||||
|
earlier versions may yield unpredictable results. If you meet these
|
||||||
|
requirements you can install this package using the command below:
|
||||||
|
|
||||||
|
$ go get github.com/seccomp/libseccomp-golang
|
||||||
|
|
||||||
|
* Testing the Library
|
||||||
|
|
||||||
|
A number of tests and lint related recipes are provided in the Makefile, if
|
||||||
|
you want to run the standard regression tests, you can excute the following:
|
||||||
|
|
||||||
|
$ make check
|
||||||
|
|
||||||
|
In order to execute the 'make lint' recipe the 'golint' tool is needed, it
|
||||||
|
can be found at:
|
||||||
|
|
||||||
|
-> https://github.com/golang/lint
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue