diff --git a/docker.spec b/docker.spec index 64db0ff8d5e7c98f8e4a2e9e306940c2c68f6bed..fd22da54423b7ab0283fea7101da30d977fe7142 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 341 +Release: 342 Epoch: 2 Summary: The open-source application container engine Group: Tools/Docker @@ -119,7 +119,8 @@ 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 runc -install -p -m 755 /usr/bin/runc $RPM_BUILD_ROOT/%{_bindir}/runc +mkdir -p $RPM_BUILD_ROOT/usr/local/bin/ +install -p -m 755 /usr/bin/runc $RPM_BUILD_ROOT/usr/local/bin/runc # install udev rules install -d $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d @@ -170,7 +171,7 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B /%{_bindir}/containerd /%{_bindir}/docker-proxy /%{_bindir}/containerd-shim -/%{_bindir}/runc +/usr/local/bin/runc /%{_sysconfdir}/udev/rules.d/80-docker.rules %if 0%{?is_systemd} /%{_unitdir}/docker.service @@ -227,6 +228,12 @@ fi %endif %changelog +* Sat Sep 14 2024 zhongtao - 2:18.09.0-342 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:change runc install location (/usr/bin --> /usr/local/bin) to avoid conflicts with runc pkg + * Sat Aug 31 2024 zhongjiawei - 2:18.09.0-341 - Type:bugfix - CVE:NA