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

[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8 #194

Merged
merged 3 commits into from
Jun 18, 2019
Merged

[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ae2ec3
Update containerd v1.2.6
tao12345666333 Apr 6, 2019
ce875b7
Update runc 029124da7af7360afa781a0234d1b083550f797c
tao12345666333 Apr 6, 2019
1a1bf23
bump runc binary v1.0.0-rc8
thaJeztah Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/dockerfile/install/containerd.installer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=bb71b10fd8f58240ca47fbb579b9d1028eea7c84 # v1.2.5
CONTAINERD_COMMIT=894b81a4b802e4eb2a91d1ce216b8817763c29fb # v1.2.6

install_containerd() {
echo "Install containerd version $CONTAINERD_COMMIT"
Expand Down
2 changes: 1 addition & 1 deletion hack/dockerfile/install/runc.installer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=2b18fe1d885ee5083ef9f0838fee39b62d653e30
RUNC_COMMIT=425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8

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