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

!67 使用源码中编译生成的docker-proxy文件打包，以便获取更好的兼容性支持

Browse Source 
From: @northgarden 
Reviewed-by: @xu_lei_123 
Signed-off-by: @xu_lei_123
This commit is contained in:
openeuler-ci-bot 2024-07-03 01:51:46 +00:00 committed by Gitee
commit 2c812d0b70
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moby.spec
View File

@ -7,7 +7,7 @@
Name: docker Name: docker
Version: 25.0.3 Version: 25.0.3
Release: 7 Release: 8
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
@ -72,7 +72,6 @@ BuildRequires: systemd-devel
BuildRequires: tar BuildRequires: tar
BuildRequires: which BuildRequires: which
BuildRequires: golang >= 1.18.0 BuildRequires: golang >= 1.18.0
BuildRequires: docker-proxy
%description engine %description engine
Docker daemon binary and related utilities Docker daemon binary and related utilities
@ -135,7 +134,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
@ -193,6 +192,12 @@ fi
%systemd_postun_with_restart docker.service %systemd_postun_with_restart docker.service
%changelog %changelog
* Tue Jul 02 2024 zhangbowei<zhangbowei@kylinos.cn> - 25.0.3-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix bug by using docker-proxy in the source file to get better compatibility
* Fri Jun 28 2024 shechenglong<shechenglong@xfusion.com> - 25.0.3-7 * Fri Jun 28 2024 shechenglong<shechenglong@xfusion.com> - 25.0.3-7
- DESC:software package name moby is changed to docker - DESC:software package name moby is changed to docker