From 30979490321c7f09de5b60603965030cb6662ee4050ac62ea75edf750204c607 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 21 Jun 2023 01:08:39 +0000
Subject: [PATCH 1/2] Accepting request 1094114 from
 home:danishprakash:branches:Virtualization:containers

Add docker-rootless-extras subpackage

OBS-URL: https://build.opensuse.org/request/show/1094114
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=388
---
 docker.changes |  6 ++++++
 docker.spec    | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/docker.changes b/docker.changes
index 66daeee..9a4a23f 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 20 15:28:13 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
+
+- Add docker-rootless-extras subpackage
+  (https://docs.docker.com/engine/security/rootless)
+
 -------------------------------------------------------------------
 Wed Jun 14 13:02:01 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/docker.spec b/docker.spec
index ca59b71..66c730d 100644
--- a/docker.spec
+++ b/docker.spec
@@ -119,6 +119,7 @@ Requires:       iptables >= 1.4
 Requires:       procps
 Requires:       tar >= 1.26
 Requires:       xz >= 4.9
+Requires:       %{name}-rootless-extras
 %sysusers_requires
 Requires(post): %fillup_prereq
 Requires(post): udev
@@ -141,6 +142,20 @@ Docker is a great building block for automating distributed systems: large-scale
 web deployments, database clusters, continuous deployment systems, private PaaS,
 service-oriented architectures, etc.
 
+%package rootless-extras
+Summary:        Rootless support for Docker
+Group:          System/Management
+Requires:       %{name} = %{version}
+Requires:       slirp4netns >= 0.4
+Requires:       fuse-overlayfs >= 0.7
+Requires:       rootlesskit
+BuildArch:      noarch
+
+%description rootless-extras
+Rootless support for Docker.
+Use dockerd-rootless.sh to run the daemon.
+Use dockerd-rootless-setuptool.sh to setup systemd for dockerd-rootless.sh.
+
 %package bash-completion
 Summary:        Bash Completion for %{name}
 Group:          System/Shells
@@ -297,6 +312,10 @@ install -p -m0644 %{cli_builddir}/man/man8/*.8 %{buildroot}%{_mandir}/man8
 # sysusers.d
 install -D -m0644 %{SOURCE106} %{buildroot}%{_sysusersdir}/%{name}.conf
 
+# rootless extras
+install -D -p -m 0755 contrib/dockerd-rootless.sh %{buildroot}/%{_bindir}/dockerd-rootless.sh
+install -D -p -m 0755 contrib/dockerd-rootless-setuptool.sh %{buildroot}/%{_bindir}/dockerd-rootless-setuptool.sh
+
 %fdupes %{buildroot}
 
 %pre -f %{name}.pre
@@ -367,4 +386,9 @@ grep -q '^dockremap:' /etc/subgid || \
 %defattr(-,root,root)
 %{_datadir}/fish/vendor_completions.d/%{name}.fish
 
+%files rootless-extras
+%defattr(-,root,root)
+%{_bindir}/dockerd-rootless.sh
+%{_bindir}/dockerd-rootless-setuptool.sh
+
 %changelog

From 33446d7e7c0ed7f8afaae3997943e975eb5b99a89074f2d901c87effacf43ec1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 29 Jun 2023 12:27:54 +0000
Subject: [PATCH 2/2] Accepting request 1095951 from
 home:danishprakash:branches:Virtualization:containers

Recommend docker-rootless-extras instead of Require(ing) it

OBS-URL: https://build.opensuse.org/request/show/1095951
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=389
---
 docker.changes | 7 +++++++
 docker.spec    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker.changes b/docker.changes
index 9a4a23f..9630441 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 29 10:07:13 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
+
+- Recommend docker-rootless-extras instead of Require(ing) it, given
+  it's an additional functionality and not inherently required for
+  docker to function.
+
 -------------------------------------------------------------------
 Tue Jun 20 15:28:13 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
 
diff --git a/docker.spec b/docker.spec
index 66c730d..31637a1 100644
--- a/docker.spec
+++ b/docker.spec
@@ -119,7 +119,6 @@ Requires:       iptables >= 1.4
 Requires:       procps
 Requires:       tar >= 1.26
 Requires:       xz >= 4.9
-Requires:       %{name}-rootless-extras
 %sysusers_requires
 Requires(post): %fillup_prereq
 Requires(post): udev
@@ -130,7 +129,8 @@ Requires(post): shadow
 Recommends:     lvm2 >= 2.2.89
 Recommends:     git-core >= 1.7
 # Required for "docker buildx" support.
-Recommends:     docker-buildx
+Recommends:     %{name}-buildx
+Recommends:     %{name}-rootless-extras
 ExcludeArch:    s390 ppc
 
 %description