From 6389bbea743d44300295f3b36f5c79f60941d62f Mon Sep 17 00:00:00 2001 From: xulei Date: Thu, 14 Sep 2023 03:28:37 +0000 Subject: [PATCH 1/2] Fix missing runc dependencies and conflicts with the installation of docker-engine Signed-off-by: xulei --- moby.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/moby.spec b/moby.spec index 7a3a019..8769ec9 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: moby Version: 20.10.24 -Release: 3 +Release: 4 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -31,6 +31,7 @@ Requires: %{name}-client = %{version}-%{release} # conflicting packages Conflicts: docker-ce Conflicts: docker-io +Conflicts: docker-engine Conflicts: docker-engine-cs Conflicts: docker-ee @@ -42,7 +43,8 @@ lightweight container. Summary: Docker daemon binary and related utilities Requires: /usr/sbin/groupadd -Requires: docker-client +Requires: %{name}-client = %{version}-%{release} +Requires: runc Requires: container-selinux >= 2:2.74 Requires: libseccomp >= 2.3 Requires: systemd @@ -80,7 +82,8 @@ Docker daemon binary and related utilities %package client Summary: Docker client binary and related utilities -Requires: /bin/sh +Requires: /bin/sh +Requires: %{name}-engine = %{version}-%{release} BuildRequires: libtool-ltdl-devel %description client @@ -197,6 +200,10 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Sep 14 2023 xulei - 20.10.24-4 +- DESC: Fix missing runc dependencies + The declaration conflicts with the installation of docker-engine + * Mon Sep 4 2023 xulei - 20.10.24-3 - Fix the conflict libnetwork installation -- Gitee From de09fceb14e6e26ea90cb3c43a3ef74e25cba517 Mon Sep 17 00:00:00 2001 From: xulei Date: Thu, 14 Sep 2023 03:58:07 +0000 Subject: [PATCH 2/2] Fix missing runc dependencies and conflicts with the installation of docker-engine Signed-off-by: xulei --- moby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby.spec b/moby.spec index 8769ec9..358a43e 100644 --- a/moby.spec +++ b/moby.spec @@ -44,7 +44,7 @@ Summary: Docker daemon binary and related utilities Requires: /usr/sbin/groupadd Requires: %{name}-client = %{version}-%{release} -Requires: runc +Requires: docker-runc Requires: container-selinux >= 2:2.74 Requires: libseccomp >= 2.3 Requires: systemd -- Gitee