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

Commit 0585b88

Browse files
authored
Merge pull request #386 from thaJeztah/18.09_backport_bump_containerd_v1.2.10
[18.09 backport] update containerd 1.2.10, runc v1.0.0-rc8-92-g84373aaa (CVE-2019-16884)
2 parents b070eef + 10a7169 commit 0585b88

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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=894b81a4b802e4eb2a91d1ce216b8817763c29fb # v1.2.6
7+
CONTAINERD_COMMIT=b34a5c8af56e510852c35414db4c1f4fa6172339 # v1.2.10
88

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

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=425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8
7+
RUNC_COMMIT=3e425f80a8c931f88e6d94a8c831b9d5aa481657 # v1.0.0-rc8-92-g84373aaa
88

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

0 commit comments

Comments
 (0)