diff --git a/Dockerfile b/Dockerfile index 52049c9dd5..ad277300a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -620,7 +620,7 @@ RUN --mount=type=bind,target=.,rw \ xx-go --wrap PKG_CONFIG=$(xx-go env PKG_CONFIG) ./hack/make.sh $target xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/dockerd$([ "$(xx-info os)" = "windows" ] && echo ".exe") - xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/docker-proxy$([ "$(xx-info os)" = "windows" ] && echo ".exe") + [ "$(xx-info os)" != "linux" ] || xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/docker-proxy mkdir /build mv /tmp/bundles/${target}-daemon/* /build/ EOT diff --git a/cmd/docker-proxy/genwinres_windows.go b/cmd/docker-proxy/genwinres_windows.go deleted file mode 100644 index 86697d8a57..0000000000 --- a/cmd/docker-proxy/genwinres_windows.go +++ /dev/null @@ -1,5 +0,0 @@ -//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=../../cli/winresources/docker-proxy/winres.json --out=../../cli/winresources/docker-proxy/resource - -package main - -import _ "github.com/docker/docker/cli/winresources/docker-proxy" diff --git a/cmd/docker-proxy/main.go b/cmd/docker-proxy/main_linux.go similarity index 100% rename from cmd/docker-proxy/main.go rename to cmd/docker-proxy/main_linux.go diff --git a/cmd/docker-proxy/network_proxy_test.go b/cmd/docker-proxy/network_proxy_linux_test.go similarity index 100% rename from cmd/docker-proxy/network_proxy_test.go rename to cmd/docker-proxy/network_proxy_linux_test.go diff --git a/cmd/docker-proxy/proxy.go b/cmd/docker-proxy/proxy_linux.go similarity index 100% rename from cmd/docker-proxy/proxy.go rename to cmd/docker-proxy/proxy_linux.go diff --git a/cmd/docker-proxy/sctp_proxy.go b/cmd/docker-proxy/sctp_proxy_linux.go similarity index 100% rename from cmd/docker-proxy/sctp_proxy.go rename to cmd/docker-proxy/sctp_proxy_linux.go diff --git a/cmd/docker-proxy/tcp_proxy.go b/cmd/docker-proxy/tcp_proxy_linux.go similarity index 100% rename from cmd/docker-proxy/tcp_proxy.go rename to cmd/docker-proxy/tcp_proxy_linux.go diff --git a/cmd/docker-proxy/udp_proxy.go b/cmd/docker-proxy/udp_proxy_linux.go similarity index 100% rename from cmd/docker-proxy/udp_proxy.go rename to cmd/docker-proxy/udp_proxy_linux.go diff --git a/hack/make/binary-proxy b/hack/make/binary-proxy index 9fa51f76cd..7285d962af 100644 --- a/hack/make/binary-proxy +++ b/hack/make/binary-proxy @@ -2,7 +2,8 @@ set -e -( +# docker-proxy is Linux only +[ "$(go env GOOS)" != 'linux' ] || ( export CGO_ENABLED=0 DOCKER_STATIC=1 diff --git a/hack/make/dynbinary-proxy b/hack/make/dynbinary-proxy index d732df13a4..436db2e188 100644 --- a/hack/make/dynbinary-proxy +++ b/hack/make/dynbinary-proxy @@ -2,7 +2,8 @@ set -e -( +# docker-proxy is Linux only +[ "$(go env GOOS)" != 'linux' ] || ( export LDFLAGS_STATIC='' export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo