Skip to content

Commit 692a7f5

Browse files
authored
Merge pull request #1037 from robmry/remove_rootlesskit-docker-proxy
Remove 'rootlesskit-docker-proxy'
2 parents 9a1c3c1 + c8ca13e commit 692a7f5

3 files changed

Lines changed: 1 addition & 4 deletions

File tree

deb/common/rules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ override_dh_auto_install:
8585

8686
# docker-ce-rootless-extras install
8787
install -D -m 0755 /usr/local/bin/rootlesskit debian/docker-ce-rootless-extras/usr/bin/rootlesskit
88-
install -D -m 0755 /usr/local/bin/rootlesskit-docker-proxy debian/docker-ce-rootless-extras/usr/bin/rootlesskit-docker-proxy
8988
install -D -m 0755 engine/contrib/dockerd-rootless.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless.sh
9089
install -D -m 0755 engine/contrib/dockerd-rootless-setuptool.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless-setuptool.sh
9190
# TODO: how can we install vpnkit?

rpm/SPECS/docker-ce-rootless-extras.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ TMP_GOPATH="/go" ${RPM_BUILD_DIR}/src/engine/hack/dockerfile/install/install.sh
4848
install -D -p -m 0755 engine/contrib/dockerd-rootless.sh ${RPM_BUILD_ROOT}%{_bindir}/dockerd-rootless.sh
4949
install -D -p -m 0755 engine/contrib/dockerd-rootless-setuptool.sh ${RPM_BUILD_ROOT}%{_bindir}/dockerd-rootless-setuptool.sh
5050
install -D -p -m 0755 /usr/local/bin/rootlesskit ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit
51-
install -D -p -m 0755 /usr/local/bin/rootlesskit-docker-proxy ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit-docker-proxy
5251

5352
%files
5453
%{_bindir}/dockerd-rootless.sh
5554
%{_bindir}/dockerd-rootless-setuptool.sh
5655
%{_bindir}/rootlesskit
57-
%{_bindir}/rootlesskit-docker-proxy
5856

5957
%post
6058

static/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static-linux: static-cli static-engine static-buildx-plugin ## create tgz
5050

5151
# extra binaries for running rootless
5252
mkdir -p build/linux/docker-rootless-extras
53-
for f in rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh dockerd-rootless-setuptool.sh vpnkit; do \
53+
for f in rootlesskit dockerd-rootless.sh dockerd-rootless-setuptool.sh vpnkit; do \
5454
if [ -f $(ENGINE_DIR)/bundles/binary/$$f ]; then \
5555
cp -L $(ENGINE_DIR)/bundles/binary/$$f build/linux/docker-rootless-extras/$$f; \
5656
fi \

0 commit comments

Comments
 (0)