From 10d7a63ab04a091bc1b31aae7520458293f5929b Mon Sep 17 00:00:00 2001 From: "Artur M. Wolff" Date: Fri, 30 Jul 2021 14:01:48 +0200 Subject: [PATCH] Makefile: include arm64 (instead of arm) executables in arm64v8 images Change-Id: Ic9cd5cd7b052efcb75499c338dd60480f960c4fa --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1f8505119..3d38ae5bf 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ satellite-image: satellite_linux_arm satellite_linux_arm64 satellite_linux_amd64 --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ -f cmd/satellite/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG}-arm64v8 \ - --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm64v8 \ + --build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \ -f cmd/satellite/Dockerfile . .PHONY: storagenode-image @@ -206,7 +206,7 @@ storagenode-image: storagenode_linux_arm storagenode_linux_arm64 storagenode_lin --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ -f cmd/storagenode/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG}-arm64v8 \ - --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm64v8 \ + --build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \ -f cmd/storagenode/Dockerfile . .PHONY: uplink-image uplink-image: uplink_linux_arm uplink_linux_arm64 uplink_linux_amd64 ## Build uplink Docker image @@ -216,7 +216,7 @@ uplink-image: uplink_linux_arm uplink_linux_arm64 uplink_linux_amd64 ## Build up --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ -f cmd/uplink/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/uplink:${TAG}${CUSTOMTAG}-arm64v8 \ - --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm64v8 \ + --build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \ -f cmd/uplink/Dockerfile . .PHONY: versioncontrol-image versioncontrol-image: versioncontrol_linux_arm versioncontrol_linux_arm64 versioncontrol_linux_amd64 ## Build versioncontrol Docker image @@ -226,7 +226,7 @@ versioncontrol-image: versioncontrol_linux_arm versioncontrol_linux_arm64 versio --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ -f cmd/versioncontrol/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/versioncontrol:${TAG}${CUSTOMTAG}-arm64v8 \ - --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm64v8 \ + --build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \ -f cmd/versioncontrol/Dockerfile . .PHONY: binary