Accepting request 1095978 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/1095978
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=133

docker.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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>
+
+- 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>
 

docker.spec

@@ -129,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
@@ -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