From 9878aa0f0557524c9af9b350f3dfa75783061b30 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 26 Apr 2026 04:06:15 +0900 Subject: [PATCH] rootless: drop dependency on slirp4netns|vpnkit|pasta Signed-off-by: Akihiro Suda --- pkg/docker-engine/deb/control | 4 ---- pkg/docker-engine/deb/rules | 1 - pkg/docker-engine/rpm/docker-ce-rootless-extras.spec | 4 ---- 3 files changed, 9 deletions(-) diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control index 4b885ba7..0b1b5b7e 100644 --- a/pkg/docker-engine/deb/control +++ b/pkg/docker-engine/deb/control @@ -57,11 +57,7 @@ Enhances: docker-ce Conflicts: rootlesskit Replaces: rootlesskit Breaks: rootlesskit -# slirp4netns (>= 0.4.0) is available in Debian since 11 and Ubuntu since 19.10 -Recommends: slirp4netns (>= 0.4.0) | passt Description: Rootless support for Docker. Use dockerd-rootless.sh to run the daemon. Use dockerd-rootless-setuptool.sh to setup systemd for dockerd-rootless.sh . - This package contains RootlessKit, but does not contain VPNKit. - Either slirp4netns (>= 0.4.0), passt, or VPNKit needs to be installed separately. Homepage: https://docs.docker.com/engine/security/rootless/ diff --git a/pkg/docker-engine/deb/rules b/pkg/docker-engine/deb/rules index 31a9d6ac..111a90d3 100755 --- a/pkg/docker-engine/deb/rules +++ b/pkg/docker-engine/deb/rules @@ -36,7 +36,6 @@ override_dh_auto_install: install -D -p -m 0755 /usr/local/bin/rootlesskit debian/docker-ce-rootless-extras/usr/bin/rootlesskit install -D -p -m 0755 engine/contrib/dockerd-rootless.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless.sh 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? override_dh_installinit: # use "docker" as our service name, not "docker-ce" diff --git a/pkg/docker-engine/rpm/docker-ce-rootless-extras.spec b/pkg/docker-engine/rpm/docker-ce-rootless-extras.spec index 55a7dd45..aca3cc02 100644 --- a/pkg/docker-engine/rpm/docker-ce-rootless-extras.spec +++ b/pkg/docker-engine/rpm/docker-ce-rootless-extras.spec @@ -14,8 +14,6 @@ Packager: Docker Requires: docker-ce # TODO: conditionally add `Requires: dbus-daemon` for Fedora and CentOS 8 -# slirp4netns >= 0.4 is available in the all supported versions of CentOS and Fedora. -Requires: (slirp4netns >= 0.4 or passt) BuildRequires: bash @@ -26,8 +24,6 @@ Conflicts: rootlesskit Rootless support for Docker. Use dockerd-rootless.sh to run the daemon. Use dockerd-rootless-setuptool.sh to setup systemd for dockerd-rootless.sh . -This package contains RootlessKit, but does not contain VPNKit. -Either slirp4netns (>= 0.4.0), passt, or VPNKit needs to be installed separately. %prep %setup -q -c -n src -a 0