add option to build multi-platform image (#160)

Signed-off-by: Dmitry Shmulevich <[email protected]>

Author: dmitsh

.github/workflows/docker.yml

@@ -43,17 +43,26 @@ jobs:
             type=ref,event=branch
             type=sha,priority=100,prefix=,suffix=,format=short
 
+      # Set up QEMU for cross-platform builds
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      # Set up Docker Buildx
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
-          build-args: |
-            TARGETOS=linux
-            TARGETARCH=amd64
           push: ${{ github.event_name != 'pull_request' }}
+          #build-args: |
+          #  TARGETOS=linux
+          #  TARGETARCH=amd64
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,4 +1,6 @@
-FROM golang:1.23.3 AS builder
+# syntax=docker/dockerfile:1
+
+FROM --platform=${TARGETOS}/${TARGETARCH} golang:1.23.3 AS builder
 
 WORKDIR /go/src/github.com/NVIDIA/topograph
 COPY . .
@@ -8,6 +10,6 @@ ARG TARGETARCH
 
 RUN make build-${TARGETOS}-${TARGETARCH}
 
-FROM gcr.io/distroless/static-debian11:nonroot
+FROM --platform=${TARGETOS}/${TARGETARCH} gcr.io/distroless/static-debian11:nonroot
 
 COPY --from=builder /go/src/github.com/NVIDIA/topograph/bin/* /usr/local/bin/

Makefile

@@ -16,7 +16,7 @@ LINTER_BIN ?= golangci-lint
 DOCKER_BIN ?= docker
 GOOS ?= $(shell uname | tr '[:upper:]' '[:lower:]')
 GOARCH ?= $(shell arch | sed 's/x86_64/amd64/')
-TARGETS := topograph node-observer node-data-broker-initc toposim
+TARGETS := topograph node-observer node-data-broker-initc
 CMD_DIR := ./cmd
 OUTPUT_DIR := ./bin
 
@@ -83,12 +83,19 @@ proto:
 
 .PHONY: image-build
 image-build:
-	$(DOCKER_BIN) build --build-arg TARGETOS=linux --build-arg TARGETARCH=amd64 -t $(IMAGE_REPO):$(IMAGE_TAG) -f ./Dockerfile .
+	$(DOCKER_BIN) build --build-arg TARGETOS=$(GOOS) --build-arg TARGETARCH=$(GOARCH) -t $(IMAGE_REPO):$(IMAGE_TAG) -f ./Dockerfile .
 
 .PHONY: image-push
 image-push: image-build
 	$(DOCKER_BIN) push $(IMAGE_REPO):$(IMAGE_TAG)
 
+.PHONY: docker
+docker:
+	docker buildx create --use --name=crossplat --node=crossplat || true
+	docker buildx build \
+		--platform linux/amd64,linux/arm64 \
+		-t $(IMAGE_REPO):$(IMAGE_TAG) -f ./Dockerfile --push .
+
 .PHONY: ssl
 ssl:
 	SSL_DIR=ssl ./scripts/configure-ssl.sh