Merge pull request #2357 from flatcar/containerd-1.6.14-main

Upgrade Containerd in main from 1.6.13 to 1.6.14
flatcar-archive · Dec 23, 2022 · cd27b56 · cd27b56
2 parents 14a6508 + d2e3a79
commit cd27b56
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
@@ -1 +1 @@
-DIST containerd-1.6.13.tar.gz 8698580 BLAKE2B f4aca5e8a305d7398a436758c75ba3c838c2674a1a2e6a8e54c2ca8d8690753a928a17bebe328a6eb349127cdeb285c028533b58fd2e590dce1893725dbaaecc SHA512 d29808541c55e189002653695d9b358d9dd209710c6e9c56b421a0ac7900bd8af6119a6549854cdf4618c32b9a85cfcb2b6f8f782cd0a306cd18756f277601c4
+DIST containerd-1.6.14.tar.gz 8698335 BLAKE2B 5f088faa35ffbcfd2e62334c12f9c741e23199d6d9999e28c69ad21b760fb85f514ef70cfdeebbdfaab914a8905ea7dae989d9fc8da36f3e077196e14dd6a220 SHA512 d29e2fb4a43f12d7e196f95b59b2c55793a1848177fb64b8bd9a4fd299fe54680a26f8a809b1d63f653ed9f0b30c209fc39d46b78ac0914d3253a10e5d3b015b
diff --git a/...ation/containerd/containerd-1.6.13.ebuild → ...ation/containerd/containerd-1.6.14.ebuild b/...ation/containerd/containerd-1.6.13.ebuild → ...ation/containerd/containerd-1.6.14.ebuild
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/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="6a712ee408b318e32ef902949b467fe996edd6d7"
+	CONTAINERD_COMMIT="631e8cb0d5c999b28aa3efa595e12bec00cbdd53"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot

diff --git a/app-torcx/docker/docker-20.10.ebuild b/app-torcx/docker/docker-20.10.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
 RDEPEND="
 	~app-emulation/docker-20.10.22
 	~app-emulation/docker-cli-20.10.22
-	~app-emulation/containerd-1.6.13
+	~app-emulation/containerd-1.6.14
 	~app-emulation/docker-proxy-0.8.0_p20210525
 	~app-emulation/docker-runc-1.1.4
 	=dev-libs/libltdl-2.4.7

diff --git a/changelog/updates/2022-12-23-containerd-1.6.14-update.md b/changelog/updates/2022-12-23-containerd-1.6.14-update.md
@@ -0,0 +1 @@
+- containerd ([1.6.14](https://github.com/containerd/containerd/releases/tag/v1.6.14))
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DIST containerd-1.6.13.tar.gz 8698580 BLAKE2B f4aca5e8a305d7398a436758c75ba3c838c2674a1a2e6a8e54c2ca8d8690753a928a17bebe328a6eb349127cdeb285c028533b58fd2e590dce1893725dbaaecc SHA512 d29808541c55e189002653695d9b358d9dd209710c6e9c56b421a0ac7900bd8af6119a6549854cdf4618c32b9a85cfcb2b6f8f782cd0a306cd18756f277601c4
		DIST containerd-1.6.14.tar.gz 8698335 BLAKE2B 5f088faa35ffbcfd2e62334c12f9c741e23199d6d9999e28c69ad21b760fb85f514ef70cfdeebbdfaab914a8905ea7dae989d9fc8da36f3e077196e14dd6a220 SHA512 d29e2fb4a43f12d7e196f95b59b2c55793a1848177fb64b8bd9a4fd299fe54680a26f8a809b1d63f653ed9f0b30c209fc39d46b78ac0914d3253a10e5d3b015b
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- containerd ([1.6.14](https://github.com/containerd/containerd/releases/tag/v1.6.14))