[engine][vendor] forks of containerd + runc + runtime-spec

This vendors from the docker org:
- containerd to 6e23458c129b551d5c9871e5174f6b1b7f6d1170
- runc to 810190ceaa507aa2727d7ae6f4790c76ec150bd2
- runtime-spec to a45ba0989fc26c695fe166a49c45bb8b7618ab36

This fixes two issues:
- if the container is paused, it now responds properly to SIGKILL
- on buggy kernels such as RHEL7.2, a int64->uint64 conversion bug
  prevented containers to start when memory cgroup was specified.

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass
2017-07-07 01:35:43 +00:00
parent 02c1d87617
commit 2206628703
9 changed files with 55 additions and 27 deletions

View File

@ -3,8 +3,8 @@
TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4
CONTAINERD_COMMIT=cfb82a876ecc11b5ca0977d1733adbe58599088a
RUNC_COMMIT=810190ceaa507aa2727d7ae6f4790c76ec150bd2
CONTAINERD_COMMIT=6e23458c129b551d5c9871e5174f6b1b7f6d1170
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120

View File

@ -29,7 +29,7 @@ install_runc() {
install_containerd() {
echo "Install containerd version $CONTAINERD_COMMIT"
git clone https://github.com/containerd/containerd.git "$GOPATH/src/github.com/containerd/containerd"
git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/containerd/containerd"
cd "$GOPATH/src/github.com/containerd/containerd"
git checkout -q "$CONTAINERD_COMMIT"
make $1