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

Merge pull request #194 from thaJeztah/18.09_backport_bump_containerd_v1.2.6

Browse source 
[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8
This commit is contained in:
Andrew Hsu 2019-06-18 09:41:42 -07:00 • committed by GitHub
commit 3bacaaded9
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=bb71b10fd8f58240ca47fbb579b9d1028eea7c84 # v1.2.5 CONTAINERD_COMMIT=894b81a4b802e4eb2a91d1ce216b8817763c29fb # v1.2.6
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=2b18fe1d885ee5083ef9f0838fee39b62d653e30 RUNC_COMMIT=425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8
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