summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-07-07 08:57:13 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-08-03 23:05:21 -0400
commit52ec02f96dd70dc42f0fa144f6d24fffd3865969 (patch)
tree9b7b39f69a0cce03ba9a801581d243c44621d437
parent8915d8d54b724eaba37de9f08b7e617881c4ee5d (diff)
downloadmeta-virtualization-52ec02f96dd70dc42f0fa144f6d24fffd3865969.tar.gz
containerd: update to 1.6.6
Bumping containerd to version v1.6.6-10-g4e92d8e7e, which comprises the following commits: 37dfc5c9d [release/1.6] Fix WWW-Authenticate parsing fa2016d58 [release/1.6] Downgrade MinGW to version 10.2.0 99c56d217 ctr: fix label args used in NewContainer 51de785f8 [release/1.6] Make building static binaries simpler 2ea4e6348 update runc binary to v1.1.3 61213742a Prepare release notes for v1.6.6 f92068350 Implicitly discard the input to drain the reader 2eb67213b [release/1.6] Limit the response size of ExecSync 185e87275 Prepare release notes for v1.6.5 5c9c83d3e [release/1.6] update golang to 1.17.11 fdcdc27bc update go-cni/for cni update fixing plugins that don't respond with version e33b9e709 archive: add human-readable hint to Lchown error 3bb5a9d19 config: improve config v1 deprecation message 6eff5b6c0 [release/1.6] go.mod: Bump hcsshim to 0.9.3 f1d2d9260 [release/1.6] vendor: golang.org/x/sys v0.0.0-20220412211240-33da011f77ad 9f99be51b [release/1.6] update golang to 1.17.10 246a1b42e vendor: github.com/opencontainers/runc v1.1.2 43717e03a update runc binary to v1.1.2 82a77be2d reverts removal of parallel run from critest 06bdfeb67 Allow git commands in Vagrantfile 70839a344 Bug fix for mount path handling 1520bae0f update critools to v1.24 0d1d2953b Prepare release notes for 1.6.4 42d691fe6 Bump opencontainers/selinux from 1.10.0 to 1.10.1 e9f22e008 Update go-cni to v1.1.5 be4909e95 cri: close fifos when container is deleted baa386dc0 Prepare release notes for v1.6.3 e8da82adc tracing: fix panic on startup when configured 1764ea9a2 CRI: improve image pulling performance 9cd76d465 [release/1.6] update golang to 1.17.9 c09cc1242 check for duplicate nspath possibilities fe6ba62ce metrics/cgroups: fix deadlock issue in Add during Collect 8b81a7843 [release/1.6] go.mod: update image-spec to merge-commit of v1 into main f2ba2041b update runc binary to v1.1.1 b736b4dab go.mod: github.com/opencontainers/runc v1.1.1 72f1e58c7 CI: add Rocky Linux 8 7ede40c5c [release/1.6] vendor: github.com/containerd/imgcrypt v1.1.4 5538be6cf cgroup2: monitor OOMKill instead of OOM to prevent missing container OOM events da35c19da Test turning off golang CI lint cache a0213573b Add nolint:staticcheck to platform-specific calls ad0036ed6 Update prometheus client vendor c7bbf316f Mount devmapper xfs file system with "nouuid" option. a1de89c3e Make the temp mount as ready only in container WithVolumes 82a12edf2 moving up to go-cni v1.1.4 28b44826b native: fix deadlock from leaving transactions open 8461dd6e5 Prepare release notes for v1.6.2 91800c4e9 Add static checks to shim for Windows ca51d7f85 Update go.mod go version 765df6609 [release/1.6] remove empty go mod to allow building for go 1.18 e9af80859 Fix the Inheritable capability defaults. 7c929318a Update TestNormalize to only test Windows 06985e7d0 Upgrade golangci-lint and its GitHub Action b13d3e05c cri: relax test for system without hugetlb Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/containerd/containerd-opencontainers_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index b0f92b12..35a27d46 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
5 support as well as checkpoint and restore for cloning and live migration of containers." 5 support as well as checkpoint and restore for cloning and live migration of containers."
6 6
7 7
8SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" 8SRCREV = "4e92d8e7e439530f5bb17e57a77481e9aa3da851"
9SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ 9SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \
10 file://0001-Add-build-option-GODEBUG-1.patch \ 10 file://0001-Add-build-option-GODEBUG-1.patch \
11 file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ 11 file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
@@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht
15LICENSE = "Apache-2.0" 15LICENSE = "Apache-2.0"
16LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" 16LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"
17 17
18CONTAINERD_VERSION = "v1.6.1" 18CONTAINERD_VERSION = "v1.6.6"
19CVE_VERSION = "1.6.1" 19CVE_VERSION = "1.6.6"
20 20
21EXTRA_OEMAKE += "GODEBUG=1" 21EXTRA_OEMAKE += "GODEBUG=1"
22 22
@@ -56,7 +56,7 @@ do_compile() {
56 metrics filters identifiers labels leases plugin server services \ 56 metrics filters identifiers labels leases plugin server services \
57 cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ 57 cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \
58 cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ 58 cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \
59 shutdown schedcore tracing; do 59 shutdown schedcore tracing kmutex; do
60 if [ -d ${S}/src/import/${c} ]; then 60 if [ -d ${S}/src/import/${c} ]; then
61 ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} 61 ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c}
62 fi 62 fi