From 4e68d6567dc3586d9e05aa46e8208e9c7fcf3023 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 7 Apr 2026 19:59:56 +0900 Subject: [PATCH] rootless: drop dependency on slirp4netns|vpnkit|pasta RootlessKit v3.0 no longer requires an external program for networking. See moby/moby PR 52319 Signed-off-by: Akihiro Suda --- deb/common/control | 4 ---- deb/common/rules | 1 - rpm/SPECS/docker-ce-rootless-extras.spec | 4 ---- static/Makefile | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/deb/common/control b/deb/common/control index 004a2a0cb6..767454ed95 100644 --- a/deb/common/control +++ b/deb/common/control @@ -84,13 +84,9 @@ 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/ Package: docker-buildx-plugin diff --git a/deb/common/rules b/deb/common/rules index 14ec3fedc1..853d5ee7c1 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -124,7 +124,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/rpm/SPECS/docker-ce-rootless-extras.spec b/rpm/SPECS/docker-ce-rootless-extras.spec index 399b0d0733..ca339e6c37 100644 --- a/rpm/SPECS/docker-ce-rootless-extras.spec +++ b/rpm/SPECS/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 diff --git a/static/Makefile b/static/Makefile index ba4425f19a..38fa32cef2 100644 --- a/static/Makefile +++ b/static/Makefile @@ -50,7 +50,7 @@ static-linux: static-cli static-engine static-buildx-plugin ## create tgz # extra binaries for running rootless mkdir -p build/linux/docker-rootless-extras - for f in rootlesskit dockerd-rootless.sh dockerd-rootless-setuptool.sh vpnkit; do \ + for f in rootlesskit dockerd-rootless.sh dockerd-rootless-setuptool.sh; do \ if [ -f $(ENGINE_DIR)/bundles/binary/$$f ]; then \ cp -L $(ENGINE_DIR)/bundles/binary/$$f build/linux/docker-rootless-extras/$$f; \ fi \