packages/moby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename back to moby

Browse Source
This commit is contained in:
Funda Wang 2024-11-22 17:36:06 +08:00
parent 60852aaf34
commit 696c7ddfa2
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
moby.spec
View File

@ -5,9 +5,9 @@
%global _source_docker_init tini-0.19.0 %global _source_docker_init tini-0.19.0
%define _debugsource_template %{nil} %define _debugsource_template %{nil}
Name: docker Name: moby
Version: 25.0.3 Version: 25.0.3
Release: 19 Release: 20
Summary: The open-source application container engine Summary: The open-source application container engine
License: ASL 2.0 License: ASL 2.0
URL: https://www.docker.com URL: https://www.docker.com
@ -38,6 +38,8 @@ Conflicts: docker-ce
Conflicts: docker-io Conflicts: docker-io
Conflicts: docker-engine-cs Conflicts: docker-engine-cs
Conflicts: docker-ee Conflicts: docker-ee
Obsoletes: docker < %{version}-%{release}
Provides: docker = %{version}-%{release}
%description %description
Docker is a product for you to build, ship and run any application as a Docker is a product for you to build, ship and run any application as a
@ -78,13 +80,16 @@ BuildRequires: systemd-devel
BuildRequires: tar BuildRequires: tar
BuildRequires: which BuildRequires: which
BuildRequires: golang >= 1.18.0 BuildRequires: golang >= 1.18.0
BuildRequires: docker-proxy Obsoletes: docker-engine < %{version}-%{release}
Conflicts: docker-engine >= 2:18
Requires: libnetwork = %{version}-%{release}
%description engine %description engine
Docker daemon binary and related utilities Docker daemon binary and related utilities
%package client %package client
Summary: Docker client binary and related utilities Summary: Docker client binary and related utilities
Obsoletes: docker-client < %{version}-%{release}
Requires: /bin/sh Requires: /bin/sh
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
@ -92,6 +97,15 @@ BuildRequires: libtool-ltdl-devel
%description client %description client
Docker client binary and related utilities Docker client binary and related utilities
%package -n libnetwork
Summary: Proxy used for docker port mapping
Provides: docker-proxy
Obsoletes: docker-proxy
Conflicts: docker-engine < 25.0.3-20
%description -n libnetwork
Proxy used for docker port mapping.
%prep %prep
%setup -q -n %{_source_client} %setup -q -n %{_source_client}
%setup -q -T -n %{_source_engine} -b 1 %setup -q -T -n %{_source_engine} -b 1
@ -148,7 +162,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 -D -p -m 0755 $(readlink -f %{_builddir}/%{_source_engine}/bundles/dynbinary-daemon/dockerd) %{buildroot}%{_bindir}/dockerd
# install proxy # install proxy
install -D -p -m 0755 /usr/bin/docker-proxy %{buildroot}%{_bindir}/docker-proxy install -D -p -m 0755 %{_builddir}/%{_source_engine}/bundles/dynbinary-daemon/docker-proxy %{buildroot}%{_bindir}/docker-proxy
# install tini # install tini
install -D -p -m 755 %{_builddir}/%{_source_docker_init}/tini-static %{buildroot}%{_bindir}/docker-init install -D -p -m 755 %{_builddir}/%{_source_docker_init}/tini-static %{buildroot}%{_bindir}/docker-init
@ -181,11 +195,13 @@ install -p -m 644 %{_builddir}/%{_source_client}/{LICENSE,MAINTAINERS,NOTICE,REA
%files engine %files engine
%config(noreplace) %{_sysconfdir}/sysconfig/docker %config(noreplace) %{_sysconfdir}/sysconfig/docker
%{_bindir}/dockerd %{_bindir}/dockerd
%{_bindir}/docker-proxy
%{_bindir}/docker-init %{_bindir}/docker-init
%{_unitdir}/docker.service %{_unitdir}/docker.service
%{_unitdir}/docker.socket %{_unitdir}/docker.socket
%files -n libnetwork
%{_bindir}/docker-proxy
%files client %files client
%{_bindir}/docker %{_bindir}/docker
%{_datadir}/bash-completion/completions/docker %{_datadir}/bash-completion/completions/docker
@ -208,6 +224,10 @@ fi
%systemd_postun_with_restart docker.service %systemd_postun_with_restart docker.service
%changelog %changelog
* Fri Nov 22 2024 Funda Wang <fundawang@yeah.net> - 25.0.3-20
- rename back to moby
- split docker-proxy for docker 18 to use
* Thu Nov 14 2024 shechenglong <shechenglong@xfusion.com> - 25.0.3-19 * Thu Nov 14 2024 shechenglong <shechenglong@xfusion.com> - 25.0.3-19
- DESC: Resolving installation conflicts between docker-engine and libnetwork - DESC: Resolving installation conflicts between docker-engine and libnetwork