From e64d29d70451e051bfa34d29297f2f09a6dfb02f Mon Sep 17 00:00:00 2001 From: shechenglong Date: Thu, 14 Nov 2024 09:37:33 +0000 Subject: [PATCH] Resolving installation conflicts between docker-engine and libnetwork Signed-off-by: shechenglong --- moby.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/moby.spec b/moby.spec index 6f879b1..fba49db 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 25.0.3 -Release: 18 +Release: 19 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -78,6 +78,7 @@ BuildRequires: systemd-devel BuildRequires: tar BuildRequires: which BuildRequires: golang >= 1.18.0 +BuildRequires: docker-proxy %description engine Docker daemon binary and related utilities @@ -147,7 +148,7 @@ ver="$(%{_builddir}/%{_source_client}/build/docker --version)"; \ install -D -p -m 0755 $(readlink -f %{_builddir}/%{_source_engine}/bundles/dynbinary-daemon/dockerd) %{buildroot}%{_bindir}/dockerd # install proxy -install -D -p -m 0755 %{_builddir}/%{_source_engine}/bundles/dynbinary-daemon/docker-proxy %{buildroot}%{_bindir}/docker-proxy +install -D -p -m 0755 /usr/bin/docker-proxy %{buildroot}%{_bindir}/docker-proxy # install tini install -D -p -m 755 %{_builddir}/%{_source_docker_init}/tini-static %{buildroot}%{_bindir}/docker-init @@ -207,6 +208,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Nov 14 2024 shechenglong - 25.0.3-19 +- DESC: Resolving installation conflicts between docker-engine and libnetwork + * Fri Nov 08 2024 shechenglong - 25.0.3-18 - DESC: Don't check source exists with CreateMountpoint -- Gitee