From fc5379fee869e8fa0e9a2569a66083e61e83de18 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Sep 2021 10:13:09 +0200 Subject: [PATCH] static: windows: fix "docker-proxy.exe" being copied as "dockerd.exe" This was introduced in 09541b553c2f7646626efcc2797bd92ee48a66d0, which fixed the source-location of the docker-proxy binary, but accidentally used "dockerd.exe" as target. Signed-off-by: Sebastiaan van Stijn --- static/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/Makefile b/static/Makefile index 0dd44dd306..d698d4419a 100644 --- a/static/Makefile +++ b/static/Makefile @@ -63,7 +63,7 @@ cross-win: cross-win-engine cross-win-plugins 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/windows/amd64-daemon/dockerd-$(GEN_STATIC_VER).exe build/win/amd64/docker/dockerd.exe - cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/docker-proxy-$(GEN_STATIC_VER).exe build/win/amd64/docker/dockerd.exe + cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/docker-proxy-$(GEN_STATIC_VER).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