Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 817461b

Browse files
authored
Merge pull request #428 from thaJeztah/19.03_bump_containerd_1.2.11
[19.03] Update containerd to v1.2.11, runc v1.0.0-rc9 Upstream-commit: c4dbf369511aad26c6fd53fe3a19b6b1fbf549e3 Component: engine
2 parents 245f145 + 67f4391 commit 817461b

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

components/engine/hack/dockerfile/install/containerd.installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# containerd is also pinned in vendor.conf. When updating the binary
55
# version you may also need to update the vendor version to pick up bug
66
# fixes or new APIs.
7-
CONTAINERD_COMMIT=b34a5c8af56e510852c35414db4c1f4fa6172339 # v1.2.10
7+
CONTAINERD_COMMIT=f772c10a585ced6be8f86e8c58c2b998412dd963 # v1.2.11
88

99
install_containerd() {
1010
echo "Install containerd version $CONTAINERD_COMMIT"

components/engine/hack/dockerfile/install/runc.installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The version of runc should match the version that is used by the containerd
55
# version that is used. If you need to update runc, open a pull request in
66
# the containerd project first, and update both after that is merged.
7-
RUNC_COMMIT=3e425f80a8c931f88e6d94a8c831b9d5aa481657 # v1.0.0-rc8-92-g84373aaa
7+
RUNC_COMMIT=d736ef14f0288d6993a1845745d6756cfc9ddd5a # v1.0.0-rc9
88

99
install_runc() {
1010
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting

0 commit comments

Comments
 (0)