fix mac cross-compile

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

static/Makefile

@@ -28,6 +28,10 @@ ifneq ($(strip $(RUNC_VERSION)),)
 DOCKER_BUILD_OPTS +=--build-arg=RUNC_VERSION=$(RUNC_VERSION)
 endif
 
+ifeq ($(strip $(TARGETPLATFORM)),)
+TARGETPLATFORM=local
+endif
+
 .PHONY: help
 help: ## show make targets
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf " \033[36m%-20s\033[0m  %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -71,11 +75,9 @@ static-linux: static-cli static-engine static-buildx-plugin static-compose-plugi
 	done
 	tar -C build/linux -c -z -f build/linux/docker-rootless-extras-$(GEN_STATIC_VER).tgz docker-rootless-extras
 
-	# buildx
-	tar -C $(BUILDX_DIR)/bin -c -z -f build/linux/docker-buildx-plugin-$(DOCKER_BUILDX_REF:v%=%).tgz docker-buildx
-
-	# compose
+	# compose, buildx
 	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/linux/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
+	tar -C "$(BUILDX_DIR)"/bin/  -c -z -f build/linux/docker-buildx-plugin-"$(DOCKER_BUILDX_REF:v%=%)".tgz   docker-buildx
 
 .PHONY: hash_files
 hash_files:
@@ -87,30 +89,65 @@ buildx:
 	docker buildx inspect | grep -q 'Driver: docker-container' || docker buildx create --use
 
 .PHONY: cross-mac
-cross-mac: TARGETPLATFORM=darwin/amd64
-cross-mac: buildx static-buildx-plugin
-	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform=darwin/amd64,darwin/arm64 binary
-	dest=$$PWD/build/mac; cd $(CLI_DIR)/build && for platform in *; do \
-		arch=$$(echo $$platform | cut -d_ -f2); \
-		mkdir -p $$dest/$$arch/docker-cli; \
-		cp $$platform/docker-darwin-* $$dest/$$arch/docker-cli/docker && \
-		tar -C $$dest/$$arch -c -z -f $$dest/$$arch/docker-cli-$(GEN_STATIC_VER).tgz docker-cli; \
-		tar -C $(BUILDX_DIR)/bin -c -z -f $$dest/$$arch/docker-buildx-plugin-$(DOCKER_BUILDX_REF:v%=%).tgz docker-buildx; \
-	done
+cross-mac: cross-mac-amd64 cross-mac-arm64
+	@echo "Cross-compiling mac binaries"
+
+.PHONY: cross-mac-amd64
+cross-mac-amd64: TARGETPLATFORM=darwin/amd64
+cross-mac-amd64: buildx
+	# Call make again to forward the target platform, otherwise it'd would be reset
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-cli
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-buildx-plugin
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-compose-plugin
+
+	# cli
+	mkdir -p build/mac/amd64/docker-cli
+	cp -L $(CLI_DIR)/build/docker build/mac/amd64/docker-cli/docker
+	tar -C build/mac/amd64/ -c -z -f build/mac/amd64/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+
+	# compose, buildx
+	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/mac/amd64/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
+	tar -C "$(BUILDX_DIR)"/bin/  -c -z -f build/mac/amd64/docker-buildx-plugin-"$(DOCKER_BUILDX_REF:v%=%)".tgz   docker-buildx
+
+.PHONY: cross-mac-arm64
+cross-mac-arm64: TARGETPLATFORM=darwin/arm64
+cross-mac-arm64: buildx
+	# Call make again to forward the target platform, otherwise it'd would be reset
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-cli
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-buildx-plugin
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-compose-plugin
+
+	# cli
+	mkdir -p build/mac/arm64/docker-cli
+	cp -L $(CLI_DIR)/build/docker build/mac/arm64/docker-cli/docker
+	tar -C build/mac/arm64/ -c -z -f build/mac/arm64/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+
+	# compose, buildx
+	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/mac/arm64/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
+	tar -C "$(BUILDX_DIR)"/bin/  -c -z -f build/mac/arm64/docker-buildx-plugin-"$(DOCKER_BUILDX_REF:v%=%)".tgz   docker-buildx
 
 .PHONY: cross-win
-cross-win: TARGETPLATFORM=windows/amd64
-cross-win: EXT=.exe
-cross-win: cross-win-engine static-buildx-plugin
-	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform=windows/amd64 binary
+cross-win: TARGETPLATFORM=windows/arm64
+cross-win: cross-win-engine
+	# Call make again to forward the target platform, otherwise it'd would be reset
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-cli
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) EXT=".exe" static-buildx-plugin
+	$(MAKE) TARGETPLATFORM=$(TARGETPLATFORM) static-compose-plugin
 	mkdir -p build/win/amd64/docker-cli
 	mkdir -p build/win/amd64/docker-engine
 	mkdir -p build/win/amd64/docker-buildx
-	cp $(CLI_DIR)/build/docker-windows-amd64.exe build/win/amd64/docker-cli/docker.exe
+	mkdir -p build/win/amd64/docker-compose
+	cp -L $(CLI_DIR)/build/docker build/win/amd64/docker-cli/docker.exe
 	cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/dockerd.exe build/win/amd64/docker-engine/dockerd.exe
 	cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/docker-proxy.exe build/win/amd64/docker-engine/docker-proxy.exe
 	cp $(BUILDX_DIR)/bin/docker-buildx.exe build/win/amd64/docker-buildx/docker-buildx.exe
-	docker run --rm -v $(CURDIR)/build/win/amd64:/v -w /v alpine sh -c 'apk update&&apk add zip && zip -r docker-cli-$(GEN_STATIC_VER).zip docker-cli && zip -r docker-engine-$(GEN_STATIC_VER).zip docker-engine && zip -r docker-buildx-plugin--$(DOCKER_BUILDX_REF:v%=%).zip docker-buildx'
+	cp $(COMPOSE_DIR)/bin/docker-compose/docker-compose.exe build/win/amd64/docker-compose/docker-compose.exe
+
+	docker run --rm -v $(CURDIR)/build/win/amd64:/v -w /v alpine sh -c 'apk add --no-cache zip \
+	&& zip -r docker-cli-$(GEN_STATIC_VER).zip docker-cli \
+	&& zip -r docker-engine-$(GEN_STATIC_VER).zip docker-engine \
+	&& zip -r docker-buildx-plugin--$(DOCKER_BUILDX_REF:v%=%).zip docker-buildx  \
+	&& zip -r docker-compose-plugin--$(DOCKER_COMPOSE_REF:v%=%).zip docker-compose'
 	$(CHOWN) -R $(shell id -u):$(shell id -g) build
 
 .PHONY: cross-arm
@@ -133,14 +170,19 @@ static-buildx-plugin:
 
 .PHONY: static-compose-plugin
 static-compose-plugin:
-	#--platform "$(TARGETPLATFORM)" \
 	$(RM) -r "$(COMPOSE_DIR)"/bin
 	docker buildx build "$(COMPOSE_DIR)" \
 		--target compose-plugin \
-		--platform local \
+		--platform "$(or $(TARGETPLATFORM),local)" \
 		--build-arg GIT_TAG="$(DOCKER_COMPOSE_REF)" \
 		--output $(COMPOSE_DIR)/bin/docker-compose/
 
+	ls -laR $(COMPOSE_DIR)/bin
+
+.PHONY: cross-cli
+cross-cli:
+	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform="$(or $(TARGETPLATFORM),local)" binary
+
 .PHONY: cross-all-cli
 cross-all-cli:
 	$(MAKE) -C $(CLI_DIR) -f docker.Makefile VERSION=$(GEN_STATIC_VER) cross