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

!356 [sync] PR-352: add requires for docker-proxy rather than installing it manually

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jianminw 
Signed-off-by: @jianminw
This commit is contained in:
openeuler-ci-bot 2024-12-02 06:31:33 +00:00 committed by Gitee
commit 50b310391f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker.spec
View File

@ -1,12 +1,12 @@
Name: docker-engine Name: docker-engine
Version: 18.09.0 Version: 18.09.0
Release: 342 Release: 343
Epoch: 2 Epoch: 2
Summary: The open-source application container engine Summary: The open-source application container engine
Group: Tools/Docker Group: Tools/Docker
License: ASL 2.0 License: Apache-2.0
Source0: https://github.com/docker/docker-ce/archive/v18.09.0.tar.gz Source0: https://github.com/docker/docker-ce/archive/v%{version}.tar.gz
Source1: patch.tar.gz Source1: patch.tar.gz
Source2: apply-patches Source2: apply-patches
Source3: git-commit Source3: git-commit
@ -24,15 +24,17 @@ URL: https://mobyproject.org
# most are already in the container (see contrib/builder/rpm/ARCH/generate.sh) # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh)
BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel
BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel
BuildRequires: tar containerd runc docker-proxy git BuildRequires: tar containerd runc git
# required packages on install # required packages on install
Requires: /bin/sh iptables tar xz device-mapper-libs >= 1.02.90-1 systemd-units Requires: /bin/sh iptables tar xz device-mapper-libs >= 1.02.90-1 systemd-units
Requires: /usr/bin/docker-proxy
# conflicting packages # conflicting packages
Provides: docker Provides: docker
Conflicts: docker-io Conflicts: docker-io
Conflicts: docker-engine-cs Conflicts: docker-engine-cs
%{systemd_requires}
%description %description
Docker is an open source project to build, ship and run any application as a Docker is an open source project to build, ship and run any application as a
@ -111,9 +113,6 @@ install -p -m 755 components/engine/bundles/dynbinary-daemon/dockerd $RPM_BUILD_
# install cli # install cli
install -p -m 755 components/cli/build/docker $RPM_BUILD_ROOT/%{_bindir}/docker install -p -m 755 components/cli/build/docker $RPM_BUILD_ROOT/%{_bindir}/docker
# install proxy
install -p -m 755 /usr/bin/docker-proxy $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
# install containerd # install containerd
install -p -m 755 /usr/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/containerd install -p -m 755 /usr/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/containerd
install -p -m 755 /usr/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim install -p -m 755 /usr/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim
@ -168,7 +167,6 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B
/%{_bindir}/docker /%{_bindir}/docker
/%{_bindir}/dockerd /%{_bindir}/dockerd
/%{_bindir}/containerd /%{_bindir}/containerd
/%{_bindir}/docker-proxy
/%{_bindir}/containerd-shim /%{_bindir}/containerd-shim
/%{_bindir}/runc /%{_bindir}/runc
/%{_sysconfdir}/udev/rules.d/80-docker.rules /%{_sysconfdir}/udev/rules.d/80-docker.rules
@ -227,6 +225,9 @@ fi
%endif %endif
%changelog %changelog
* Sat Nov 23 2024 Funda Wang <fundawang@yeah.net> - 2:18.09.0-343
- add requires for docker-proxy rather than installing it manually
* Fri Oct 25 2024 zhongjiawei<zhongjiawei1@huawei.com> - 2:18.09.0-342 * Fri Oct 25 2024 zhongjiawei<zhongjiawei1@huawei.com> - 2:18.09.0-342
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA