From c8ca13e39cf10ed4d2e997dd43bb7dd794a47156 Mon Sep 17 00:00:00 2001 From: Rob Murray Date: Mon, 15 Jul 2024 19:36:59 +0100 Subject: [PATCH] Remove 'rootlesskit-docker-proxy' Signed-off-by: Rob Murray --- deb/common/rules | 1 - rpm/SPECS/docker-ce-rootless-extras.spec | 2 -- static/Makefile | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/deb/common/rules b/deb/common/rules index 64ad8c937d..fd7313ffea 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -85,7 +85,6 @@ override_dh_auto_install: # docker-ce-rootless-extras install install -D -m 0755 /usr/local/bin/rootlesskit debian/docker-ce-rootless-extras/usr/bin/rootlesskit - install -D -m 0755 /usr/local/bin/rootlesskit-docker-proxy debian/docker-ce-rootless-extras/usr/bin/rootlesskit-docker-proxy install -D -m 0755 engine/contrib/dockerd-rootless.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless.sh install -D -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? diff --git a/rpm/SPECS/docker-ce-rootless-extras.spec b/rpm/SPECS/docker-ce-rootless-extras.spec index b29c66745a..5f6f2bc9d9 100644 --- a/rpm/SPECS/docker-ce-rootless-extras.spec +++ b/rpm/SPECS/docker-ce-rootless-extras.spec @@ -48,13 +48,11 @@ TMP_GOPATH="/go" ${RPM_BUILD_DIR}/src/engine/hack/dockerfile/install/install.sh install -D -p -m 0755 engine/contrib/dockerd-rootless.sh ${RPM_BUILD_ROOT}%{_bindir}/dockerd-rootless.sh install -D -p -m 0755 engine/contrib/dockerd-rootless-setuptool.sh ${RPM_BUILD_ROOT}%{_bindir}/dockerd-rootless-setuptool.sh install -D -p -m 0755 /usr/local/bin/rootlesskit ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit -install -D -p -m 0755 /usr/local/bin/rootlesskit-docker-proxy ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit-docker-proxy %files %{_bindir}/dockerd-rootless.sh %{_bindir}/dockerd-rootless-setuptool.sh %{_bindir}/rootlesskit -%{_bindir}/rootlesskit-docker-proxy %post diff --git a/static/Makefile b/static/Makefile index e1e3efa016..74983c4162 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 rootlesskit-docker-proxy dockerd-rootless.sh dockerd-rootless-setuptool.sh vpnkit; do \ + for f in rootlesskit dockerd-rootless.sh dockerd-rootless-setuptool.sh vpnkit; do \ if [ -f $(ENGINE_DIR)/bundles/binary/$$f ]; then \ cp -L $(ENGINE_DIR)/bundles/binary/$$f build/linux/docker-rootless-extras/$$f; \ fi \