[packages/docker-ce] Up to 29.3.0

[arekm]

commit 6594e05dd05839ab6eb1da157753792c25487599
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 11 22:36:23 2026 +0100

    Up to 29.3.0

 docker-ce.spec | 19 ++++++++-----------
 docker.init    |  6 +++---
 systemd.patch  | 18 ++++--------------
 3 files changed, 15 insertions(+), 28 deletions(-)
---
diff --git a/docker-ce.spec b/docker-ce.spec
index f7da7bc..af70756 100644
--- a/docker-ce.spec
+++ b/docker-ce.spec
@@ -1,12 +1,12 @@
 Summary:	Docker CE: the open-source application container engine
 Name:		docker-ce
-Version:	28.3.0
+Version:	29.3.0
 Release:	1
 License:	Apache v2.0
 Group:		Applications/System
 # https://github.com/moby/moby/releases
-Source0:	https://github.com/moby/moby/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	87a336d8939e50bd34526d748d33faeb
+Source0:	https://github.com/moby/moby/archive/refs/tags/docker-v%{version}.tar.gz
+# Source0-md5:	2b0a2e6e732601b0099c5f06fbb7f359
 Source1:	dockerd.sh
 Source2:	docker.init
 Source3:	docker.sysconfig
@@ -14,6 +14,7 @@ Patch0:		systemd.patch
 URL:		https://www.docker.com/
 BuildRequires:	golang >= 1.21
 BuildRequires:	linux-libc-headers >= 7:4.12
+BuildRequires:	nftables-devel
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 2.009
 BuildRequires:	systemd-devel
@@ -25,6 +26,7 @@ Requires:	ca-certificates
 Requires:	containerd >= 1.6.22
 Requires:	iproute2 >= 3.5
 Requires:	iptables >= 1.4
+Requires:	nftables
 Requires:	procps
 Requires:	rc-scripts >= 0.4.0.10
 Requires:	systemd-units >= 38
@@ -67,13 +69,12 @@ operation and support of hundreds of thousands of applications and
 databases.
 
 %prep
-%setup -q -n moby-%{version}
+%setup -q -n moby-docker-v%{version}
 %patch -P0 -p1
 
 %build
 export VERSION=%{version}
 export DOCKER_GITCOMMIT="PLD-Linux/%{version}"
-export GO111MODULE=off
 
 AUTO_GOPATH=1 \
 bash -x hack/make.sh dynbinary
@@ -95,9 +96,6 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/dockerd
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/docker
 
-# install udev rules
-install -d $RPM_BUILD_ROOT/lib/udev/rules.d
-cp -p contrib/udev/80-docker.rules $RPM_BUILD_ROOT/lib/udev/rules.d
 
 %pre
 %groupadd -g 296 docker
@@ -105,14 +103,14 @@ cp -p contrib/udev/80-docker.rules $RPM_BUILD_ROOT/lib/udev/rules.d
 %post
 /sbin/chkconfig --add docker
 %service -n docker restart
-%systemd_post docker.service
+%systemd_post docker.service docker.socket
 
 %preun
 if [ "$1" = "0" ]; then
 	%service -q docker stop
 	/sbin/chkconfig --del docker
 fi
-%systemd_preun docker.service
+%systemd_preun docker.service docker.socket
 
 %postun
 if [ "$1" = "0" ]; then
@@ -146,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/dockerd
 %{systemdunitdir}/docker.service
 %{systemdunitdir}/docker.socket
-/lib/udev/rules.d/80-docker.rules
 
 %dir %attr(700,root,root) /var/lib/docker
 %dir %attr(700,root,root) /var/lib/docker/containers
diff --git a/docker.init b/docker.init
index a3ee788..c210793 100755
--- a/docker.init
+++ b/docker.init
@@ -8,7 +8,7 @@
 #  self-sufficient containers from any application. The same container that a \
 #  developer builds and tests on a laptop can run at scale, in production, on \
 #  VMs, bare metal, OpenStack clusters, public clouds and more. \
-# processname:	docker
+# processname:	dockerd
 # pidfile: /var/run/docker.pid
 #
 
@@ -67,7 +67,7 @@ stop() {
 
 	# Stop daemons.
 	msg_stopping "Docker"
-	killproc --pidfile $pidfile docker
+	killproc --pidfile $pidfile dockerd
 	rm -f /var/lock/subsys/docker
 }
 
@@ -102,7 +102,7 @@ case "$1" in
 	condrestart 7
 	;;
   status)
-	status --pidfile $pidfile docker docker
+	status --pidfile $pidfile dockerd dockerd
 	RETVAL=$?
 	;;
   *)
diff --git a/systemd.patch b/systemd.patch
index 2f5acaf..f2d63b8 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -1,9 +1,10 @@
---- docker-1.12.1/contrib/init/systemd/docker.service	2016-08-30 00:06:51.450800482 +0300
-+++ docker-1.12.1/contrib/init/systemd/docker.service	2016-09-26 21:36:55.000000000 +0300
-@@ -5,11 +5,12 @@
+--- a/contrib/init/systemd/docker.service
++++ b/contrib/init/systemd/docker.service
+@@ -9,11 +9,13 @@
  StartLimitIntervalSec=60
  
  [Service]
++Environment=OPTIONS=
 +EnvironmentFile=-/etc/sysconfig/docker
  Type=notify
  # the default is not to use systemd for cgroups because the delegate issues still
@@ -14,14 +15,3 @@
  ExecReload=/bin/kill -s HUP $MAINPID
  TimeoutStartSec=0
  RestartSec=2
---- moby-27.1.2/contrib/init/systemd/docker.socket.orig	2024-08-10 15:59:46.000000000 +0200
-+++ moby-27.1.2/contrib/init/systemd/docker.socket	2024-08-20 20:17:39.947517005 +0200
-@@ -4,7 +4,7 @@
- [Socket]
- # If /var/run is not implemented as a symlink to /run, you may need to
- # specify ListenStream=/var/run/docker.sock instead.
--ListenStream=/run/docker.sock
-+ListenStream=/var/run/docker.sock
- SocketMode=0660
- SocketUser=root
- SocketGroup=docker
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker-ce.git/commitdiff/6594e05dd05839ab6eb1da157753792c25487599