From 6ae2ec3fbe75886d8d73f93c46ced33258d86929 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Sat, 6 Apr 2019 16:51:56 +0000 Subject: [PATCH 1/3] Update containerd v1.2.6 Signed-off-by: Jintao Zhang (cherry picked from commit 8092cfb6e7396e0c5fc319b86ce9dca2246210f2) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 3b369259b6e4e..8b15eb8ff6b1c 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -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" From ce875b746bdcc37ff1c92dc181c78ba619d02d24 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Sat, 6 Apr 2019 16:53:33 +0000 Subject: [PATCH 2/3] Update runc 029124da7af7360afa781a0234d1b083550f797c Signed-off-by: Jintao Zhang (cherry picked from commit d43a41d7af7c4858e4b2ed41775c34b92cd35179) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/runc.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer index 532a7f72ee869..670cac5878a05 100755 --- a/hack/dockerfile/install/runc.installer +++ b/hack/dockerfile/install/runc.installer @@ -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=029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da install_runc() { # If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting From 1a1bf23d17e44d22ebec2b1d0e38329bd35b0127 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 25 Apr 2019 18:56:17 -0700 Subject: [PATCH 3/3] bump runc binary v1.0.0-rc8 full diff: https://github.com/opencontainers/runc/compare/029124da7af7360afa781a0234d1b083550f797c...425e105d5a03fabd737a126ad93d62a9eeede87f - opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 4bc310c11babd2aa635eb08a5bbc198f96bc19b3) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/runc.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer index 670cac5878a05..a8156db97ff58 100755 --- a/hack/dockerfile/install/runc.installer +++ b/hack/dockerfile/install/runc.installer @@ -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=029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da +RUNC_COMMIT=425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8 install_runc() { # If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting