sync group creation to 24.03-sp1

Signed-off-by: shechenglong <shechenglong@xfusion.com>
This commit is contained in:
shechenglong 2024-11-08 08:35:12 +00:00 committed by Gitee
parent 41fdaaa625
commit 578668d15a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -7,7 +7,7 @@
Name: docker
Version: 25.0.3
Release: 16
Release: 17
Summary: The open-source application container engine
License: ASL 2.0
URL: https://www.docker.com
@ -29,8 +29,8 @@ Patch0006: 0006-tini.c-a-function-declaration-without-a-prototype-is.patch
Patch0007: 0007-fix-libnetwork-osl-test-TestAddRemoveInterface.patch
Patch0008: 0008-api-omit-missing-Created-field-from-ImageInspect-res.patch
Patch0009: 0009-integration-Add-container-output-utility.patch
Requires: %{name}-engine = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
Requires(meta): %{name}-engine = %{version}-%{release}
Requires(meta): %{name}-client = %{version}-%{release}
# conflicting packages
Conflicts: docker-ce
@ -45,7 +45,7 @@ lightweight container.
%package engine
Summary: Docker daemon binary and related utilities
Requires: /usr/sbin/groupadd
Requires(pre): /usr/sbin/groupadd
Requires: runc
Requires: container-selinux >= 2:2.74
Requires: libseccomp >= 2.3
@ -55,6 +55,7 @@ Requires: libcgroup
Requires: containerd
Requires: tar
Requires: xz
%{?systemd_requires}
BuildRequires: bash
BuildRequires: ca-certificates
@ -189,19 +190,25 @@ install -p -m 644 %{_builddir}/%{_source_client}/{LICENSE,MAINTAINERS,NOTICE,REA
%{_datadir}/fish/vendor_completions.d/docker.fish
%doc %{_pkgdocdir}
%post
%systemd_post docker.service
%pre engine
if ! getent group docker > /dev/null; then
groupadd --system docker
fi
%preun
%post engine
%systemd_post docker.service
%preun engine
%systemd_preun docker.service docker.socket
%postun
%postun engine
%systemd_postun_with_restart docker.service
%changelog
* Fri Nov 08 2024 shechenglong <shechenglong@xfusion.com> - 25.0.3-17
- DESC: move group creation into pre section rather than post section
change requires into meta dependency for its actual use
* Wed Nov 6 2024 sunchendong<sunchendong@xfusion.com> - 25.0.3-16
- DESC:Add container.Output utility