static: fix location of Windows binary

thaJeztah · thaJeztah · commit 09541b553c2f · 2021-06-30T13:16:51.000+02:00
Not sure why, but looks like the path used `&lt;arch&gt;-daemon` (instead of just `&lt;arch&gt;`).
However, it's not consistent either, because `containerutility.exe` is in `&lt;arch&gt;`?

When running:

    make REF=master checkout
    make REF=master DOCKER_BUILD_PKGS=cross-win static

The build failed:

    mkdir -p build/win/amd64/docker
    cp /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/cli/build/docker-windows-amd64.exe build/win/amd64/docker/docker.exe
    cp /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/cross/windows/amd64/dockerd-0.0.0-20210629140245-4a6fe51.exe build/win/amd64/docker/dockerd.exe
    cp: /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/cross/windows/amd64/dockerd-0.0.0-20210629140245-4a6fe51.exe: No such file or directory
    make[1]: *** [cross-win] Error 1
    make: *** [static] Error 2

This is what's in bundles:

    tree /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/
    /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/
    └── cross
        └── windows
            ├── amd64
            │   └── containerutility.exe
            └── amd64-daemon
                ├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe
                ├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe.md5
                ├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe.sha256
                ├── docker-proxy.exe -&gt; docker-proxy-0.0.0-20210629140245-4a6fe51.exe
                ├── dockerd-0.0.0-20210629140245-4a6fe51.exe
                ├── dockerd-0.0.0-20210629140245-4a6fe51.exe.md5
                ├── dockerd-0.0.0-20210629140245-4a6fe51.exe.sha256
                └── dockerd.exe -&gt; dockerd-0.0.0-20210629140245-4a6fe51.exe

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/static/Makefile b/static/Makefile
@@ -62,7 +62,8 @@ cross-win: cross-win-engine cross-win-plugins
 	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform=windows/amd64 binary
 	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/dockerd-$(GEN_STATIC_VER).exe build/win/amd64/docker/dockerd.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
 	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
 
