From 1aff0f42d3bd893c2b9309fda1d6acca54b627183b9fd10ee2a6c3aaa060dfb6 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 12 Sep 2023 10:34:53 +0000 Subject: [PATCH 1/2] Accepting request 1108423 from home:psaggu:branches:Virtualization:containers - Add `Provides: cri-runtime` to use containerd as container runtime in Factory Kubernetes packages OBS-URL: https://build.opensuse.org/request/show/1108423 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=154 --- containerd.changes | 5 +++++ containerd.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/containerd.changes b/containerd.changes index 08c8c3b..60c5ac0 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 31 09:20:32 UTC 2023 - Priyanka Saggu + +- Add `Provides: cri-runtime` to use containerd as container runtime in Factory Kubernetes packages + ------------------------------------------------------------------- Sun May 21 11:16:18 UTC 2023 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index 0b9a6bb..67bdf64 100644 --- a/containerd.spec +++ b/containerd.spec @@ -60,6 +60,7 @@ Provides: %{name}-kubic = %{version} Obsoletes: %{name} = 0.2.5+gitr569_2a5e70c Obsoletes: %{name}_2a5e70c ExcludeArch: s390 +Provides: cri-runtime %description Containerd is a daemon with an API and a command line client, to manage From c0c86eca4eef850c9e55ec0753acc8eb9e3ab1307619b82bd408fe6a0ec0a480 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 14 Sep 2023 06:38:14 +0000 Subject: [PATCH 2/2] Accepting request 1111017 from home:cyphar:docker - Update to Docker 24.0.6-ce. See upstream changelong online at . bsc#1215323 - Rebase patches: * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch * 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch * cli-0001-docs-include-required-tools-in-source-tree.patch - Switch from disabledrun to manualrun in _service. - Add a docker.socket unit file, but with socket activation effectively disabled to ensure that Docker will always run even if you start the socket individually. Users should probably just ignore this unit file. bsc#1210141 OBS-URL: https://build.opensuse.org/request/show/1111017 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=155 --- _service | 8 ++++---- containerd-1.6.21_3dce8eb055cb.tar.xz | 3 --- containerd-1.7.6_091922f03c27.tar.xz | 3 +++ containerd.changes | 9 ++++++++- containerd.spec | 8 ++++---- 5 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 containerd-1.6.21_3dce8eb055cb.tar.xz create mode 100644 containerd-1.7.6_091922f03c27.tar.xz diff --git a/_service b/_service index e2f3e26..5ce6be7 100644 --- a/_service +++ b/_service @@ -1,13 +1,13 @@ - + https://github.com/containerd/containerd.git git containerd - 1.6.21_%h - v1.6.21 + 1.7.6_%h + v1.7.6 .git - + *.tar xz diff --git a/containerd-1.6.21_3dce8eb055cb.tar.xz b/containerd-1.6.21_3dce8eb055cb.tar.xz deleted file mode 100644 index 029374f..0000000 --- a/containerd-1.6.21_3dce8eb055cb.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74c01d964e4387350a1d1f57a4a6aef9136a0c03ad3122e80c762fbaa44d02c5 -size 5221052 diff --git a/containerd-1.7.6_091922f03c27.tar.xz b/containerd-1.7.6_091922f03c27.tar.xz new file mode 100644 index 0000000..97a29cf --- /dev/null +++ b/containerd-1.7.6_091922f03c27.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54eefc4b7aff77b7c101bfd7b1e6b9638858e5200476cc35715937c23f833bd7 +size 5876420 diff --git a/containerd.changes b/containerd.changes index 60c5ac0..03ddc8d 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 14 04:27:07 UTC 2023 - Aleksa Sarai + +- Update to containerd v1.7.6 for Docker v24.0.6-ce. Upstream release notes: + bsc#1215323 + ------------------------------------------------------------------- Thu Aug 31 09:20:32 UTC 2023 - Priyanka Saggu -- Add `Provides: cri-runtime` to use containerd as container runtime in Factory Kubernetes packages +- Add `Provides: cri-runtime` to use containerd as container runtime in Factory + Kubernetes packages ------------------------------------------------------------------- Sun May 21 11:16:18 UTC 2023 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index 67bdf64..85d9be9 100644 --- a/containerd.spec +++ b/containerd.spec @@ -23,14 +23,14 @@ %endif # MANUAL: Update the git_version. -%define git_version 3dce8eb055cbb6872793272b4f20ed16117344f8 -%define git_short 3dce8eb055cb +%define git_version 091922f03c2762540fd057fba91260237ff86acb +%define git_short 091922f03c27 %global provider_prefix github.com/containerd/containerd %global import_path %{provider_prefix} Name: containerd -Version: 1.6.21 +Version: 1.7.6 Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -41,7 +41,7 @@ Source1: %{name}-rpmlintrc Source2: %{name}.service BuildRequires: fdupes BuildRequires: glibc-devel-static -BuildRequires: go >= 1.18 +BuildRequires: go >= 1.19 BuildRequires: go-go-md2man BuildRequires: golang-packaging BuildRequires: libbtrfs-devel >= 3.8