beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40048 from tao12345666333/update-to-runc-1.0.0-rc9

Browse source 
Update containerd to v1.3.1, runc v1.0.0-rc9
This commit is contained in:
Brian Goff 2019-11-27 14:20:17 -08:00 committed by GitHub
commit 3152f94362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/dockerfile/install/containerd.installer
View file

@ -4,7 +4,7 @@
# containerd is also pinned in vendor.conf. When updating the binary # containerd is also pinned in vendor.conf. When updating the binary
# version you may also need to update the vendor version to pick up bug # version you may also need to update the vendor version to pick up bug
# fixes or new APIs. # fixes or new APIs.
: ${CONTAINERD_COMMIT:=36cf5b690dcc00ff0f34ff7799209050c3d0c59a} # v1.3.0 : ${CONTAINERD_COMMIT:=c7a4f874b3267c499484aae602d1257b12d69e40} # v1.3.1
install_containerd() { install_containerd() {
echo "Install containerd version $CONTAINERD_COMMIT" echo "Install containerd version $CONTAINERD_COMMIT"

2
hack/dockerfile/install/runc.installer
View file

@ -4,7 +4,7 @@
# The version of runc should match the version that is used by the containerd # The version of runc should match the version that is used by the containerd
# version that is used. If you need to update runc, open a pull request in # version that is used. If you need to update runc, open a pull request in
# the containerd project first, and update both after that is merged. # the containerd project first, and update both after that is merged.
: ${RUNC_COMMIT:=3e425f80a8c931f88e6d94a8c831b9d5aa481657} # v1.0.0-rc8-92-g84373aaa : ${RUNC_COMMIT:=d736ef14f0288d6993a1845745d6756cfc9ddd5a} # v1.0.0-rc9
install_runc() { install_runc() {
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting # If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting