From 402a2b50d0396a94675085e411768ca459d83f40a805ea00c3844c33b97c71d2 Mon Sep 17 00:00:00 2001 From: Daniel Orf Date: Wed, 20 Feb 2019 17:58:22 +0000 Subject: [PATCH 1/2] Accepting request 677763 from devel:CaaSP:Head:ControllerNode * Fix rare deadlock on FIFO creation with timeout * Fix a bug that a container can't be stopped or inspected when its corresponding image is deleted * Fix a bug that the cri plugin handles containerd events outside of k8s.io namespace more changes at: https://github.com/containerd/containerd/releases/tag/v1.2.2 Changelogs from previous versions also included in this update: https://github.com/containerd/containerd/releases/tag/v1.2.1 https://github.com/containerd/containerd/releases/tag/v1.2.0 https://github.com/containerd/containerd/releases/tag/v1.1.4 https://github.com/containerd/containerd/releases/tag/v1.1.3 OBS-URL: https://build.opensuse.org/request/show/677763 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=90 --- containerd.changes | 13 +++++++++++++ containerd.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/containerd.changes b/containerd.changes index c947276..1bc36b0 100644 --- a/containerd.changes +++ b/containerd.changes @@ -3,6 +3,19 @@ Tue Feb 5 11:16:46 UTC 2019 - Aleksa Sarai - Update to containerd v1.2.2, which is required for Docker v18.09.1-ce. bsc#1124308 + * Fix rare deadlock on FIFO creation with timeout + * Fix a bug that a container can't be stopped or inspected when its + corresponding image is deleted + * Fix a bug that the cri plugin handles containerd events outside of + k8s.io namespace + more changes at: + https://github.com/containerd/containerd/releases/tag/v1.2.2 + Changelogs from previous versions also included in this update: + https://github.com/containerd/containerd/releases/tag/v1.2.1 + https://github.com/containerd/containerd/releases/tag/v1.2.0 + https://github.com/containerd/containerd/releases/tag/v1.1.4 + https://github.com/containerd/containerd/releases/tag/v1.1.3 + - Remove required_dockerrunc commit pinning, as it just lead to issues. - Remove upstreamed patches. - 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch diff --git a/containerd.spec b/containerd.spec index 912b2ea..7d25178 100644 --- a/containerd.spec +++ b/containerd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # nodebuginfo From fbeeb3f56b390ea0db3099a3b09d4e1e18e7812116f592653cc5073cc243f6a6 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 25 Mar 2019 06:51:51 +0000 Subject: [PATCH 2/2] Accepting request 687620 from home:sgrunert - Update containerd to v1.2.4 * cri: Set /etc/hostname * cri: Fix env performance issue * runc updated to 6635b4f0c6af3810594d2770f662f34ddc15b40d to solve * CVE-2019-5736 * cri updated to da0c016c830b2ea97fd1d737c49a568a816bf964 * Windows: NewDirectIOFromFIFOSet * Changelogs from previous versions also included in this update: https://github.com/containerd/containerd/releases/tag/v1.2.3 OBS-URL: https://build.opensuse.org/request/show/687620 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=91 --- _service | 2 +- containerd-git.9754871865f7.tar.xz | 3 --- containerd-git.e6b3f5632f50.tar.xz | 3 +++ containerd.changes | 13 +++++++++++++ containerd.spec | 10 +++++----- 5 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 containerd-git.9754871865f7.tar.xz create mode 100644 containerd-git.e6b3f5632f50.tar.xz diff --git a/_service b/_service index ad57a3f..9ce891c 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git containerd git.%h - v1.2.2 + v1.2.4 .git diff --git a/containerd-git.9754871865f7.tar.xz b/containerd-git.9754871865f7.tar.xz deleted file mode 100644 index 3d75ec9..0000000 --- a/containerd-git.9754871865f7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27a3e7925faabba7e1b793067e1f7f79aed632c05a334cc528fa306a6ef6c14e -size 2618852 diff --git a/containerd-git.e6b3f5632f50.tar.xz b/containerd-git.e6b3f5632f50.tar.xz new file mode 100644 index 0000000..e4a4c42 --- /dev/null +++ b/containerd-git.e6b3f5632f50.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aa1e606f2844d33c806eb7128d0ced462fb1263e64cebec3f6f07f2a111d3f3 +size 2721860 diff --git a/containerd.changes b/containerd.changes index 1bc36b0..ccb9bee 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Mar 21 14:30:03 UTC 2019 - Sascha Grunert + +- Update containerd to v1.2.4 + * cri: Set /etc/hostname + * cri: Fix env performance issue + * runc updated to 6635b4f0c6af3810594d2770f662f34ddc15b40d to solve + * CVE-2019-5736 + * cri updated to da0c016c830b2ea97fd1d737c49a568a816bf964 + * Windows: NewDirectIOFromFIFOSet + * Changelogs from previous versions also included in this update: + https://github.com/containerd/containerd/releases/tag/v1.2.3 + ------------------------------------------------------------------- Tue Feb 5 11:16:46 UTC 2019 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index 7d25178..905a02e 100644 --- a/containerd.spec +++ b/containerd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # nodebuginfo @@ -34,12 +34,12 @@ %endif # MANUAL: Update the git_version. -%define containerd_version 1.2.2 -%define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce -%define git_short 9754871865f7 +%define containerd_version 1.2.4 +%define git_version e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e +%define git_short e6b3f5632f50 Name: %{realname}%{name_suffix} -Version: 1.2.2 +Version: %{containerd_version} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0