Skip to content

Commit e0c7a83

Browse files
robmryrobmry
committed
Only build docker-proxy for Linux
Signed-off-by: Rob Murray <[email protected]>
1 parent 27b322e commit e0c7a83

10 files changed

Lines changed: 5 additions & 8 deletions

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ RUN --mount=type=bind,target=.,rw \
620620
xx-go --wrap
621621
PKG_CONFIG=$(xx-go env PKG_CONFIG) ./hack/make.sh $target
622622
xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/dockerd$([ "$(xx-info os)" = "windows" ] && echo ".exe")
623-
xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/docker-proxy$([ "$(xx-info os)" = "windows" ] && echo ".exe")
623+
[ "$(xx-info os)" != "linux" ] || xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/docker-proxy
624624
mkdir /build
625625
mv /tmp/bundles/${target}-daemon/* /build/
626626
EOT

‎cmd/docker-proxy/genwinres_windows.go‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

cmd/docker-proxy/main.go renamed to cmd/docker-proxy/main_linux.go

File renamed without changes.

cmd/docker-proxy/network_proxy_test.go renamed to cmd/docker-proxy/network_proxy_linux_test.go

File renamed without changes.

cmd/docker-proxy/proxy.go renamed to cmd/docker-proxy/proxy_linux.go

File renamed without changes.

cmd/docker-proxy/sctp_proxy.go renamed to cmd/docker-proxy/sctp_proxy_linux.go

File renamed without changes.

cmd/docker-proxy/tcp_proxy.go renamed to cmd/docker-proxy/tcp_proxy_linux.go

File renamed without changes.

cmd/docker-proxy/udp_proxy.go renamed to cmd/docker-proxy/udp_proxy_linux.go

File renamed without changes.

‎hack/make/binary-proxy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
set -e
44

5-
(
5+
# docker-proxy is Linux only
6+
[ "$(go env GOOS)" != 'linux' ] || (
67
export CGO_ENABLED=0
78

89
DOCKER_STATIC=1

‎hack/make/dynbinary-proxy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
set -e
44

5-
(
5+
# docker-proxy is Linux only
6+
[ "$(go env GOOS)" != 'linux' ] || (
67
export LDFLAGS_STATIC=''
78
export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary
89
export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo

0 commit comments

Comments
 (0)