Accepting request 1111017 from home:cyphar:docker
- Update to Docker 24.0.6-ce. See upstream changelong online at <https://docs.docker.com/engine/release-notes/24.0/#2406>. 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
This commit is contained in:
parent
1aff0f42d3
commit
c0c86eca4e
8
_service
8
_service
@ -1,13 +1,13 @@
|
|||||||
<services>
|
<services>
|
||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="manual">
|
||||||
<param name="url">https://github.com/containerd/containerd.git</param>
|
<param name="url">https://github.com/containerd/containerd.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="filename">containerd</param>
|
<param name="filename">containerd</param>
|
||||||
<param name="versionformat">1.6.21_%h</param>
|
<param name="versionformat">1.7.6_%h</param>
|
||||||
<param name="revision">v1.6.21</param>
|
<param name="revision">v1.7.6</param>
|
||||||
<param name="exclude">.git</param>
|
<param name="exclude">.git</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="manual">
|
||||||
<param name="file">*.tar</param>
|
<param name="file">*.tar</param>
|
||||||
<param name="compression">xz</param>
|
<param name="compression">xz</param>
|
||||||
</service>
|
</service>
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:74c01d964e4387350a1d1f57a4a6aef9136a0c03ad3122e80c762fbaa44d02c5
|
|
||||||
size 5221052
|
|
3
containerd-1.7.6_091922f03c27.tar.xz
Normal file
3
containerd-1.7.6_091922f03c27.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:54eefc4b7aff77b7c101bfd7b1e6b9638858e5200476cc35715937c23f833bd7
|
||||||
|
size 5876420
|
@ -1,7 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 14 04:27:07 UTC 2023 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
- Update to containerd v1.7.6 for Docker v24.0.6-ce. Upstream release notes:
|
||||||
|
<https://github.com/containerd/containerd/releases/tag/v1.7.6> bsc#1215323
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Aug 31 09:20:32 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
|
Thu Aug 31 09:20:32 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
|
||||||
|
|
||||||
- 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 <asarai@suse.com>
|
Sun May 21 11:16:18 UTC 2023 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
@ -23,14 +23,14 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# MANUAL: Update the git_version.
|
# MANUAL: Update the git_version.
|
||||||
%define git_version 3dce8eb055cbb6872793272b4f20ed16117344f8
|
%define git_version 091922f03c2762540fd057fba91260237ff86acb
|
||||||
%define git_short 3dce8eb055cb
|
%define git_short 091922f03c27
|
||||||
|
|
||||||
%global provider_prefix github.com/containerd/containerd
|
%global provider_prefix github.com/containerd/containerd
|
||||||
%global import_path %{provider_prefix}
|
%global import_path %{provider_prefix}
|
||||||
|
|
||||||
Name: containerd
|
Name: containerd
|
||||||
Version: 1.6.21
|
Version: 1.7.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Standalone OCI Container Daemon
|
Summary: Standalone OCI Container Daemon
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -41,7 +41,7 @@ Source1: %{name}-rpmlintrc
|
|||||||
Source2: %{name}.service
|
Source2: %{name}.service
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: glibc-devel-static
|
BuildRequires: glibc-devel-static
|
||||||
BuildRequires: go >= 1.18
|
BuildRequires: go >= 1.19
|
||||||
BuildRequires: go-go-md2man
|
BuildRequires: go-go-md2man
|
||||||
BuildRequires: golang-packaging
|
BuildRequires: golang-packaging
|
||||||
BuildRequires: libbtrfs-devel >= 3.8
|
BuildRequires: libbtrfs-devel >= 3.8
|
||||||
|
Loading…
Reference in New Issue
Block a user