p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #128 from thaJeztah/18.09_backport_containerd_v1.2.1-GA

Browse Source 
[18.09 backport] update just installer of containerd to 1.2.1
Upstream-commit: 6c633fbe18e0a69db3db1aed28b3fa23bc795dfe
Component: engine
This commit is contained in:
Andrew Hsu
2018-12-07 06:18:48 -08:00
committed by GitHub
parent 679c1150b8 37a56d2599
commit c19e3d0b29
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/dockerfile/install/containerd.installer
View File

@ -4,7 +4,7 @@
# 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
# fixes or new APIs.
CONTAINERD_COMMIT=de1f167ab96338a9f5c2b17347abf84bdf1dd411 # v1.2.1-rc.0
CONTAINERD_COMMIT=9b32062dc1f5a7c2564315c269b5059754f12b9d # v1.2.1
install_containerd() {
echo "Install containerd version $CONTAINERD_COMMIT"

2
components/engine/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
# 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.
RUNC_COMMIT=10d38b660a77168360df3522881e2dc2be5056bd
RUNC_COMMIT=96ec2177ae841256168fcf76954f7177af9446eb
install_runc() {
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting