docker-ce-20.10.9-1

d/docker-ce/docker-ce-vl.spec

@@ -7,7 +7,7 @@
 
 Name: docker-ce
 Summary: The open-source application container engine
-Version: 20.10.6
+Version: 20.10.9
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system,virtualization
 Vendor: Project Vine
@@ -25,6 +25,7 @@ Source11: docker.sysconfig
 Source12: docker.conf
 Source100: docker.service
 Source101: docker.socket
+Source102: containerd.service
 
 %if %{with build_nosrc}
 NoSource: 0
@@ -86,7 +87,6 @@ depending on a particular stack or provider.
 # install binary
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_localstatedir}/lib/docker
-install -d %{buildroot}%{_localstatedir}/run/docker
 
 for f in docker/*; do
   install -p -m 755 $f %{buildroot}%{_bindir}/
@@ -95,7 +95,9 @@ done
 %if %{with systemd}
 install -D -p -m 644 %{SOURCE100} %{buildroot}%{_unitdir}/docker.service
 install -D -p -m 755 %{SOURCE101} %{buildroot}%{_unitdir}/docker.socket
+install -D -p -m 644 %{SOURCE102} %{buildroot}%{_unitdir}/containerd.service
 %else
+install -d %{buildroot}%{_localstatedir}/run/docker
 install -D -p -m 755 %{SOURCE10} %{buildroot}%{_initdir}/docker
 install -D -p -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/docker
 install -D -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/rsyslog.d/docker
@@ -115,7 +117,7 @@ fi
 
 %post
 %if %{with systemd}
-%systemd_post docker.service
+%systemd_post containerd.service docker.service
 %else
 if [ $1 -eq 1 ]; then
   /sbin/chkconfig --add docker
@@ -124,7 +126,7 @@ fi
 
 %preun
 %if %{with systemd}
-%systemd_preun docker.service
+%systemd_preun containerd.service docker.service
 %else
 if [ $1 -eq 0 -o -x /bin/systemctl ]; then
   /sbin/chkconfig docker off
@@ -134,7 +136,7 @@ fi
 
 %if %{with systemd}
 %postun
-%systemd_postun_with_restart docker.service
+%systemd_postun_with_restart containerd.service docker.service
 %endif
 
 
@@ -149,13 +151,14 @@ fi
 %{_bindir}/docker-init
 %{_bindir}/docker-proxy
 %{_bindir}/dockerd
-%dir %{_localstatedir}/run/docker
 %dir %{_localstatedir}/lib/docker
 %if %{with systemd}
 %{_unitdir}/docker.service
 %{_unitdir}/docker.socket
+%{_unitdir}/containerd.service
 %else
 %{_initdir}/docker
+%dir %{_localstatedir}/run/docker
 %config(noreplace) %{_sysconfdir}/sysconfig/docker
 %config(noreplace) %{_sysconfdir}/rsyslog.d/docker
 %endif
@@ -169,6 +172,9 @@ fi
 
 
 %changelog
+* Wed Dec 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.10.9-1
+- new upstream release.
+
 * Wed May 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.10.6-1
 - new upstream release.