From d076a91f813ba2fedc844ff7908b7d9785b37c07 Mon Sep 17 00:00:00 2001 From: xulei Date: Thu, 31 Aug 2023 10:05:38 +0000 Subject: [PATCH 1/2] Fixing the conflict between libnetwork and docker-engine installation. Signed-off-by: xulei --- moby.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/moby.spec b/moby.spec index ea316d9..5012ad7 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 @@ -33,8 +33,10 @@ Requires: %{name}-client = %{version}-%{release} # conflicting packages Conflicts: docker-ce Conflicts: docker-io +Conflicts: docker-engine Conflicts: docker-engine-cs Conflicts: docker-ee +Conflicts：libnetwork %description Docker is a product for you to build, ship and run any application as a @@ -210,6 +212,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Aug 31 2023 xulei - 20.10.24-4 +- DESC: Fix the conflict between libnetwork and docker-engine installation. + * Fri Aug 18 2023 jiangxinyu - 20.10.24-3 - Fix build error -- Gitee From 95bcc3e162e471e0f3848592db44995cca18bf22 Mon Sep 17 00:00:00 2001 From: xulei Date: Thu, 31 Aug 2023 11:15:25 +0000 Subject: [PATCH 2/2] Fix the conflict between libnetwork and docker-engine installation. Signed-off-by: xulei --- moby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby.spec b/moby.spec index 5012ad7..1908931 100644 --- a/moby.spec +++ b/moby.spec @@ -36,7 +36,7 @@ Conflicts: docker-io Conflicts: docker-engine Conflicts: docker-engine-cs Conflicts: docker-ee -Conflicts：libnetwork +Conflicts: libnetwork %description Docker is a product for you to build, ship and run any application as a -- Gitee