From a76bedc0d85d9b29f2173d831afdb30b778b0f18 Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Wed, 28 May 2025 20:30:55 +0100
Subject: [PATCH] Revert "feat: manage docker group with systemd-sysusers"

This reverts commit 8c5e99fd383b461151ef0f1e1875d1801a175c80.

Signed-off-by: Robert Sturla <robertsturla@outlook.com>
---
 deb/common/docker-ce.postinst | 20 ++++++++++++++++++++
 deb/common/rules              |  3 ---
 rpm/SPECS/docker-ce.spec      |  7 +++----
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100755 deb/common/docker-ce.postinst

diff --git a/deb/common/docker-ce.postinst b/deb/common/docker-ce.postinst
new file mode 100755
index 0000000000..eeef6ca801
--- /dev/null
+++ b/deb/common/docker-ce.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+	configure)
+		if [ -z "$2" ]; then
+			if ! getent group docker > /dev/null; then
+				groupadd --system docker
+			fi
+		fi
+		;;
+	abort-*)
+		# How'd we get here??
+		exit 1
+		;;
+	*)
+		;;
+esac
+
+#DEBHELPER#
diff --git a/deb/common/rules b/deb/common/rules
index a138122923..a25eae2e38 100755
--- a/deb/common/rules
+++ b/deb/common/rules
@@ -133,9 +133,6 @@ override_dh_auto_install:
 	install -D -p -m 0755 engine/contrib/dockerd-rootless-setuptool.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless-setuptool.sh
 	# TODO: how can we install vpnkit?
 
-	# install systemd sysusers config
-	install -D -p -m 0644 engine/contrib/systemd-sysusers/docker.conf debian/docker-ce/usr/lib/sysusers.d/docker.conf
-
 override_dh_installinit:
 	# use "docker" as our service name, not "docker-ce"
 	dh_installinit --name=docker
diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
index 57d8a90368..943162c249 100644
--- a/rpm/SPECS/docker-ce.spec
+++ b/rpm/SPECS/docker-ce.spec
@@ -84,9 +84,6 @@ install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary-daemon/dockerd) ${R
 install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary-daemon/docker-proxy) ${RPM_BUILD_ROOT}%{_bindir}/docker-proxy
 install -D -p -m 0755 /usr/local/bin/docker-init ${RPM_BUILD_ROOT}%{_libexecdir}/docker/docker-init
 
-# install systemd sysusers config
-install -D -p -m 0644 engine/contrib/systemd-sysusers/docker.conf ${RPM_BUILD_ROOT}%{_sysusersdir}/docker.conf
-
 # install systemd scripts
 install -D -p -m 0644 engine/contrib/init/systemd/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
 install -D -p -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket
@@ -103,12 +100,14 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/docker
 %{_libexecdir}/docker/docker-init
 %{_unitdir}/docker.service
 %{_unitdir}/docker.socket
-%{_sysusersdir}/docker.conf
 %{_mandir}/man*/*
 %dir /etc/docker
 
 %post
 %systemd_post docker.service
+if ! getent group docker > /dev/null; then
+    groupadd --system docker
+fi
 
 %preun
 %systemd_preun docker.service docker.socket