It's not needed, now the daemon tells RootlessKit about port
mappings directly.
Signed-off-by: Rob Murray <rob.murray@docker.com>
| ... | ... |
@@ -377,8 +377,6 @@ RUN --mount=from=rootlesskit-src,src=/usr/src/rootlesskit,rw \ |
| 377 | 377 |
export CGO_ENABLED=$([ "$DOCKER_STATIC" = "1" ] && echo "0" || echo "1") |
| 378 | 378 |
xx-go build -o /build/rootlesskit -ldflags="$([ "$DOCKER_STATIC" != "1" ] && echo "-linkmode=external")" ./cmd/rootlesskit |
| 379 | 379 |
xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /build/rootlesskit |
| 380 |
- xx-go build -o /build/rootlesskit-docker-proxy -ldflags="$([ "$DOCKER_STATIC" != "1" ] && echo "-linkmode=external")" ./cmd/rootlesskit-docker-proxy |
|
| 381 |
- xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /build/rootlesskit-docker-proxy |
|
| 382 | 380 |
EOT |
| 383 | 381 |
COPY --link ./contrib/dockerd-rootless.sh /build/ |
| 384 | 382 |
COPY --link ./contrib/dockerd-rootless-setuptool.sh /build/ |
| ... | ... |
@@ -27,7 +27,5 @@ install_rootlesskit_dynamic() {
|
| 27 | 27 |
|
| 28 | 28 |
_install_rootlesskit() ( |
| 29 | 29 |
echo "Install rootlesskit version ${ROOTLESSKIT_VERSION}"
|
| 30 |
- for f in rootlesskit rootlesskit-docker-proxy; do |
|
| 31 |
- GOBIN="${PREFIX}" GO111MODULE=on go install ${BUILD_MODE} -ldflags="$ROOTLESSKIT_LDFLAGS" "github.com/rootless-containers/rootlesskit/v2/cmd/${f}@${ROOTLESSKIT_VERSION}"
|
|
| 32 |
- done |
|
| 30 |
+ GOBIN="${PREFIX}" GO111MODULE=on go install ${BUILD_MODE} -ldflags="$ROOTLESSKIT_LDFLAGS" "github.com/rootless-containers/rootlesskit/v2/cmd/rootlesskit@${ROOTLESSKIT_VERSION}"
|
|
| 33 | 31 |
) |
| ... | ... |
@@ -14,7 +14,7 @@ copy_binaries() {
|
| 14 | 14 |
return |
| 15 | 15 |
fi |
| 16 | 16 |
echo "Copying nested executables into $dir" |
| 17 |
- for file in containerd containerd-shim-runc-v2 ctr runc docker-init rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh dockerd-rootless-setuptool.sh; do |
|
| 17 |
+ for file in containerd containerd-shim-runc-v2 ctr runc docker-init rootlesskit dockerd-rootless.sh dockerd-rootless-setuptool.sh; do |
|
| 18 | 18 |
cp -f "$(command -v "$file")" "$dir/" |
| 19 | 19 |
done |
| 20 | 20 |
# vpnkit might not be available for the target platform, see vpnkit stage in |
| ... | ... |
@@ -15,7 +15,6 @@ source "${MAKEDIR}/.install"
|
| 15 | 15 |
install_binary "${DEST}/docker-proxy"
|
| 16 | 16 |
install_binary "${DEST}/docker-init"
|
| 17 | 17 |
install_binary "${DEST}/rootlesskit"
|
| 18 |
- install_binary "${DEST}/rootlesskit-docker-proxy"
|
|
| 19 | 18 |
install_binary "${DEST}/dockerd-rootless.sh"
|
| 20 | 19 |
install_binary "${DEST}/dockerd-rootless-setuptool.sh"
|
| 21 | 20 |
if [ -f "${DEST}/vpnkit" ]; then
|
| ... | ... |
@@ -2,9 +2,6 @@ package rootless // import "github.com/docker/docker/pkg/rootless" |
| 2 | 2 |
|
| 3 | 3 |
import "os" |
| 4 | 4 |
|
| 5 |
-// RootlessKitDockerProxyBinary is the binary name of rootlesskit-docker-proxy |
|
| 6 |
-const RootlessKitDockerProxyBinary = "rootlesskit-docker-proxy" |
|
| 7 |
- |
|
| 8 | 5 |
// RunningWithRootlessKit returns true if running under RootlessKit namespaces. |
| 9 | 6 |
func RunningWithRootlessKit() bool {
|
| 10 | 7 |
return os.Getenv("ROOTLESSKIT_STATE_DIR") != ""
|