Skip to content

Commit

Permalink
Makefile: fix multi-platform image build
Browse files Browse the repository at this point in the history
platform now appears to be required due to a change in Docker

docker-library/official-images#17896

Change-Id: I3d4a3dee3cc3888316c2cff3d2343fef98acfd47
  • Loading branch information
halkyon committed Nov 19, 2024
1 parent 60c78d7 commit 6814e49
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -216,40 +216,40 @@ images: gateway-mt-image authservice-image linksharing-image ## Build Docker ima

.PHONY: gateway-mt-image
gateway-mt-image: ## Build gateway-mt Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/gateway-mt:${TAG}-amd64 \
${DOCKER_BUILD} --platform linux/amd64 --pull=true -t storjlabs/gateway-mt:${TAG}-amd64 \
-f cmd/gateway-mt/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/gateway-mt:${TAG}-arm32v6 \
${DOCKER_BUILD} --platform linux/arm/v6 --pull=true -t storjlabs/gateway-mt:${TAG}-arm32v6 \
--build-arg=GOARCH=arm \
--build-arg=DOCKER_ARCH=arm32v6 \
-f cmd/gateway-mt/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/gateway-mt:${TAG}-arm64v8 \
${DOCKER_BUILD} --platform linux/arm64 --pull=true -t storjlabs/gateway-mt:${TAG}-arm64v8 \
--build-arg=GOARCH=arm64 \
--build-arg=DOCKER_ARCH=arm64v8 \
-f cmd/gateway-mt/Dockerfile .
docker tag storjlabs/gateway-mt:${TAG}-amd64 storjlabs/gateway-mt:${LATEST_DEV_TAG}

.PHONY: authservice-image
authservice-image: ## Build authservice Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/authservice:${TAG}-amd64 \
${DOCKER_BUILD} --platform linux/amd64 --pull=true -t storjlabs/authservice:${TAG}-amd64 \
-f cmd/authservice/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/authservice:${TAG}-arm32v6 \
${DOCKER_BUILD} --platform linux/arm/v6 --pull=true -t storjlabs/authservice:${TAG}-arm32v6 \
--build-arg=GOARCH=arm \
--build-arg=DOCKER_ARCH=arm32v6 \
-f cmd/authservice/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/authservice:${TAG}-arm64v8 \
${DOCKER_BUILD} --platform linux/arm64 --pull=true -t storjlabs/authservice:${TAG}-arm64v8 \
--build-arg=GOARCH=arm64 \
--build-arg=DOCKER_ARCH=arm64v8 \
-f cmd/authservice/Dockerfile .
docker tag storjlabs/authservice:${TAG}-amd64 storjlabs/authservice:${LATEST_DEV_TAG}

.PHONY: linksharing-image
linksharing-image: ## Build linksharing Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/linksharing:${TAG}-amd64 \
${DOCKER_BUILD} --platform linux/amd64 --pull=true -t storjlabs/linksharing:${TAG}-amd64 \
-f cmd/linksharing/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/linksharing:${TAG}-arm32v6 \
${DOCKER_BUILD} --platform linux/arm/v6 --pull=true -t storjlabs/linksharing:${TAG}-arm32v6 \
--build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \
-f cmd/linksharing/Dockerfile .
${DOCKER_BUILD} --pull=true -t storjlabs/linksharing:${TAG}-arm64v8 \
${DOCKER_BUILD} --platform linux/arm64 --pull=true -t storjlabs/linksharing:${TAG}-arm64v8 \
--build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \
-f cmd/linksharing/Dockerfile .
docker tag storjlabs/linksharing:${TAG}-amd64 storjlabs/linksharing:${LATEST_DEV_TAG}
Expand Down

0 comments on commit 6814e49

Please sign in to comment.