Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions deb/common/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deb/common/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions rpm/SPECS/docker-ce-rootless-extras.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ Packager: Docker <support@docker.com>

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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion static/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading