From 1e1bf07c105883f475451a8b1eaa5bdc1b2f5c75 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 6 Aug 2024 11:14:32 +0200 Subject: [PATCH] static: remove unused docker-proxy.exe binary from Windows packages The `docker-proxy.exe` binary was added to the static Windows packages through commit 09541b553c2f7646626efcc2797bd92ee48a66d0 (which introduced a bug, later fixed through fc5379fee869e8fa0e9a2569a66083e61e83de18). It looks like that commit added the `docker-proxy.exe` binary with the assumption that it's used on Windows (given that its also built in upstream), but recent discussions revealed that's not the case. This patch removes binary from the static packages for Windows, because it's not used. A quick look at Docker Desktop's build scripts show that it's not included in those packages, and installation instructions for static binaries on Windows do not mention this binary, so no further changes should be needed. Signed-off-by: Sebastiaan van Stijn --- static/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/static/Makefile b/static/Makefile index e1e3efa016..293c8fd6a7 100644 --- a/static/Makefile +++ b/static/Makefile @@ -85,7 +85,6 @@ cross-win: cross-win-engine mkdir -p build/win/amd64/docker cp $(CLI_DIR)/build/docker-windows-amd64.exe build/win/amd64/docker/docker.exe cp $(ENGINE_DIR)/bundles/cross/win/dockerd.exe build/win/amd64/docker/dockerd.exe - cp $(ENGINE_DIR)/bundles/cross/win/docker-proxy.exe build/win/amd64/docker/docker-proxy.exe docker run --rm -v $(CURDIR)/build/win/amd64:/v -w /v alpine sh -c 'apk update&&apk add zip&&zip -r docker-$(GEN_STATIC_VER).zip docker' $(CHOWN) -R $(shell id -u):$(shell id -g) build