From 48e7a030ac900ad8cfa56c87e5c1744c1f469480 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 9 Jun 2023 08:17:10 +0000 Subject: [PATCH 1/2] app-containers/containerd: Update from 1.6.21 to 1.7.2 --- changelog/updates/2023-06-09-containerd-1.7.2-update.md | 1 + .../coreos-overlay/app-containers/containerd/Manifest | 2 +- .../{containerd-1.6.21.ebuild => containerd-1.7.2.ebuild} | 0 .../app-containers/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog/updates/2023-06-09-containerd-1.7.2-update.md rename sdk_container/src/third_party/coreos-overlay/app-containers/containerd/{containerd-1.6.21.ebuild => containerd-1.7.2.ebuild} (100%) diff --git a/changelog/updates/2023-06-09-containerd-1.7.2-update.md b/changelog/updates/2023-06-09-containerd-1.7.2-update.md new file mode 100644 index 00000000000..eeec473e55c --- /dev/null +++ b/changelog/updates/2023-06-09-containerd-1.7.2-update.md @@ -0,0 +1 @@ +- containerd ([1.7.2](https://github.com/containerd/containerd/releases/tag/v1.7.2)) diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest index 6245a9e230f..e0b41f7a9cb 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest @@ -1 +1 @@ -DIST containerd-1.6.21.tar.gz 8750934 BLAKE2B d4b0fffa628d9ec3167ebd776176d3a5884baf2f2b18add7610d8223bed4e98e5870cd4e34da7182e60c44a8fde3dfa397d3290b59384c97d276b5cb29a85b23 SHA512 a94ed8b8b9e153c9dc370228b659fcba1b03b3c47c8b5fcb001bb1b4b158ea048159f5d8d8c5294e7da3444edd76fbd903d7b7faa84e3382807a583d757325e1 +DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5 diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.6.21.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.7.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.6.21.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.7.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild index f3966b2676b..fa567e8a337 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_rc/-rc.}" EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="66c1fbccbaaac631b77184b7957e67fea4cf45ab" + CONTAINERD_COMMIT="d6d1c83955ed62e2833bd470453e0449a3164e7f" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index 7cf26b8a559..cb7c91d0db5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64" RDEPEND=" ~app-containers/docker-20.10.24 ~app-containers/docker-cli-20.10.24 - ~app-containers/containerd-1.6.21 + ~app-containers/containerd-1.7.2 ~app-containers/docker-proxy-0.8.0_p20230118 ~app-containers/runc-1.1.7 ~dev-libs/libltdl-2.4.7 From 8689304734e756ff08d40e4fceb5d0253593f4ce Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Thu, 29 Jun 2023 22:29:02 +0530 Subject: [PATCH 2/2] Fix the plugin key URI to match io.containerd.x.vx The containerd service was failing with ``` invalid plugin key URI containerd.runtime.v1.linux expect io.containerd.x.vx ``` Migrating the plugin URI to the given format gixes the issue. Signed-off-by: Sayan Chowdhury --- .../app-containers/containerd/files/config-cgroupfs.toml | 2 +- .../coreos-overlay/app-containers/containerd/files/config.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml index e2b6806b144..742fbf4355c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml @@ -18,7 +18,7 @@ uid = 0 # socket gid gid = 0 -[plugins."containerd.runtime.v1.linux"] +[plugins."io.containerd.runtime.v1.linux"] # shim binary name/path shim = "containerd-shim" # runtime binary name/path diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml index c6b44e66348..babc77b0e06 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml @@ -18,7 +18,7 @@ uid = 0 # socket gid gid = 0 -[plugins."containerd.runtime.v1.linux"] +[plugins."io.containerd.runtime.v1.linux"] # shim binary name/path shim = "containerd-shim" # runtime binary name/path