Skip to content

Fix Docker multi-arch build by using buildx directly #1935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lionello merged 3 commits into from
Feb 18, 2026
Merged

Fix Docker multi-arch build by using buildx directly #1935

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a76d3e
Initial plan
Copilot Feb 18, 2026
52161bf
Fix Docker push by using buildx for multi-arch builds
Copilot Feb 18, 2026
024c917
Remove unused Docker image variables
Copilot Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 8 additions & 41 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,51 +191,18 @@ PROJECT_NAME := defang-cli
DOCKER_REPO:=defangio
DOCKER_IMAGE_NAME:=$(DOCKER_REPO)/$(PROJECT_NAME)

DOCKER_IMAGE_ARM64:=$(DOCKER_IMAGE_NAME):arm64-$(VERSION)
DOCKER_IMAGE_AMD64:=$(DOCKER_IMAGE_NAME):amd64-$(VERSION)

.PHONY: image-amd64
image-amd64:
docker build \
--platform linux/amd64 \
-t ${PROJECT_NAME} \
-t $(DOCKER_IMAGE_AMD64) \
--build-arg VERSION=$(VERSION) \
--build-arg GO_VERSION=$(GO_VERSION) \
.

.PHONY: image-arm64
image-arm64:
docker build \
--platform linux/arm64 \
-t ${PROJECT_NAME} \
-t $(DOCKER_IMAGE_ARM64) \
## Build and push multi-arch Docker images
.PHONY: push-images
push-images: login
docker buildx build \
--platform linux/amd64,linux/arm64 \
--push \
-t $(DOCKER_IMAGE_NAME):$(VERSION) \
-t $(DOCKER_IMAGE_NAME):latest \
--build-arg VERSION=$(VERSION) \
--build-arg GO_VERSION=$(GO_VERSION) \
.

## Build all docker images and manifest
.PHONY: images
images: image-amd64 image-arm64

## Push all docker images
.PHONY: push-images
push-images: images login
docker push $(DOCKER_IMAGE_AMD64)
docker push $(DOCKER_IMAGE_ARM64)
docker manifest create --amend \
$(DOCKER_IMAGE_NAME):$(VERSION) \
$(DOCKER_IMAGE_AMD64) \
$(DOCKER_IMAGE_ARM64)
docker manifest create --amend \
$(DOCKER_IMAGE_NAME):latest \
$(DOCKER_IMAGE_AMD64) \
$(DOCKER_IMAGE_ARM64)
docker manifest push --purge \
$(DOCKER_IMAGE_NAME):$(VERSION)
docker manifest push --purge \
$(DOCKER_IMAGE_NAME):latest

## Login to docker
.PHONY: login
login:
Expand Down
Loading