build: Containerfile for multi-platform builds (#46)

use the `BUILDPLATFORM` argument to build the image for the target platform
use the `TARGETOS` and `TARGETARCH` build arguments to build the binary for the target platform
use the `TARGETPLATFORM` argument to package the image for the target platform

---------

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>

Author: xcoulon

.github/workflows/cd.yml

@@ -22,6 +22,7 @@ jobs:
           image: codeready-toolchain/argocd-mcp-server
           tags: latest ${{ env.COMMIT_SHORT_SHA }}
           containerfiles: Containerfile
+          platforms: linux/amd64
 
       - name: Log into quay.io
         uses: redhat-actions/podman-login@v1

.github/workflows/ci.yml

@@ -29,7 +29,6 @@ jobs:
       run: |
         task test
 
-    
     - name: Install Podman
       uses: redhat-actions/podman-install@main
 
@@ -44,6 +43,23 @@ jobs:
         export PATH="$GOPATH/bin:$PATH"
         task test-e2e
   
+  build-image:
+    # verifying the image can be built (real build and push is done in the `cd` workflow)
+    name: Build Image
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Build image
+      id: build-image
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: codeready-toolchain/argocd-mcp-server
+        tags: latest # we won't push the image to a registry in this workflow, so we're good with just the `latest` tag
+        containerfiles: Containerfile
+        platforms: linux/amd64
+      
   lint:
     name: Lint
     runs-on: ubuntu-24.04

Containerfile

@@ -2,26 +2,28 @@
 # Builder image
 # See https://hub.docker.com/_/golang/
 ################################################################################################
-FROM golang:1.24 as builder
-
-ARG OS=linux
-ARG ARCH=amd64
+FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
 
 WORKDIR /usr/src/app
 
+ARG TARGETOS
+ARG TARGETARCH
+
+RUN echo "Building the 'argocd-mcp-server' binary for $TARGETOS/$TARGETARCH"
+
 # pre-copy/cache parent go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
 COPY go.mod go.sum ./
 RUN go mod download && go mod verify
 
 COPY . .
 
-RUN go build -o /usr/src/app/argocd-mcp-server main.go
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /usr/src/app/argocd-mcp-server main.go
 RUN ls -la /usr/src/app/argocd-mcp-server
 
 ################################################################################################
-# image to be run by the GitHub Action job
+# image to be deployed to the target platform
 ################################################################################################
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest as argocd-mcp-server
+FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi10/ubi-micro:latest AS argocd-mcp-server
 
 # Copy the generated binary into the $PATH so it can be invoked
 COPY --from=builder /usr/src/app/argocd-mcp-server /usr/local/bin/

taskfile.yaml

@@ -38,7 +38,10 @@ tasks:
       # The idiomatic way to disable test caching explicitly is to use -count=1
       - go test github.com/codeready-toolchain/argocd-mcp-server/test/e2e/... -count=1 -v -failfast
 
-  # Continuous Deployment
   build-image:
     cmds:
-      - podman build --platform linux/amd64 --no-cache -t argocd-mcp-server:latest . -f Containerfile
+      - podman build --no-cache -t argocd-mcp-server:latest . -f Containerfile
+  
+  build-image-linux-amd64:
+    cmds:
+      - podman build --platform linux/amd64 --no-cache -t argocd-mcp-server:amd64 . -f Containerfile

test/e2e/argocd-server-mock/Containerfile

@@ -4,9 +4,6 @@
 ################################################################################################
 FROM golang:1.24 as argocd-mock-server-builder
 
-ARG OS=linux
-ARG ARCH=amd64
-
 WORKDIR /usr/src/app
 
 # pre-copy/cache parent go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change