From 42939c3ef8e2c4ae72f61137411a46a464f69c0a Mon Sep 17 00:00:00 2001 From: xulei Date: Thu, 31 Aug 2023 11:29:25 +0000 Subject: [PATCH] Fix 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 7e01b31..07f187c 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: moby Version: 20.10.24 -Release: 2 +Release: 3 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-3 +- DESC: Fix the conflict between libnetwork and docker-engine installation. + * Sun Jul 16 2023 xulei - 20.10.24-2 - DESC: fix non-blocking awslogs log drop bug fix panic if mount is not a volume -- Gitee