From 9d34ab25dd12ac54b7d45fb672881afe49ad5dd4 Mon Sep 17 00:00:00 2001 From: "G. Roggemans" Date: Mon, 1 Nov 2021 12:07:38 +0100 Subject: [PATCH] Fix architecture references in build.make file --- release-tools/build.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release-tools/build.make b/release-tools/build.make index 6caf64fd5..a151a00eb 100644 --- a/release-tools/build.make +++ b/release-tools/build.make @@ -94,7 +94,7 @@ $(CMDS:%=build-%): build-%: check-go-version-go if ! [ $${#os_arch_seen_pre} = $${#os_arch_seen} ]; then \ continue; \ fi; \ - if ! (set -x; cd ./$(CMDS_DIR)/$* && CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '$(FULL_LDFLAGS)' -o "$(abspath ./bin)/$*$$suffix" .); then \ + if ! (set -x; cd ./$(CMDS_DIR)/$* && CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '$(FULL_LDFLAGS)' -o "$(abspath ./bin)/$$arch/$*$$suffix" .); then \ echo "Building $* for GOOS=$$os GOARCH=$$arch failed, see error(s) above."; \ exit 1; \ fi; \ @@ -102,7 +102,7 @@ $(CMDS:%=build-%): build-%: check-go-version-go done $(CMDS:%=container-%): container-%: build-% - docker build -t $*:latest -f $(shell if [ -e ./$(CMDS_DIR)/$*/Dockerfile ]; then echo ./$(CMDS_DIR)/$*/Dockerfile; else echo Dockerfile; fi) --label revision=$(REV) . + docker build -t $*:latest -f $(shell if [ -e ./$(CMDS_DIR)/$*/Dockerfile ]; then echo ./$(CMDS_DIR)/$*/Dockerfile; else echo Dockerfile; fi) --label revision=$(REV) --build-arg ARCH= . $(CMDS:%=push-%): push-%: container-% set -ex; \ @@ -165,7 +165,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-% --tag $(IMAGE_NAME):$$arch-$$os-$$escaped_base_image$$tag \ --platform=$$os/$$arch \ --file $$(eval echo \$${dockerfile_$$os}) \ - --build-arg binary=./bin/$*$$suffix \ + --build-arg binary=./bin/$$arch/$*$$suffix \ --build-arg ARCH=$$arch \ --build-arg BASE_IMAGE=$$base_image \ --build-arg ADDON_IMAGE=$$addon_image \