feat: support multi-architecture builds for Go in Dockerfiles and update workflows

Signed-off-by: Aaron Wislang <aaron.wislang@microsoft.com>

Author: asw101

.devcontainer/ai-container/Dockerfile

@@ -1,8 +1,16 @@
 # Use a minimal base image designed for dev containers
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
+ARG TARGETARCH=amd64
+ENV GO_VERSION=1.25.0
+
 # Install Go (match default-container)
-RUN wget -q -O go.tar.gz https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \
+RUN case "${TARGETARCH}" in \
+        amd64) GO_ARCH=amd64 ;; \
+        arm64) GO_ARCH=arm64 ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && wget -q -O go.tar.gz "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
     && tar -C /usr/local -xzf go.tar.gz \
     && rm go.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"

.devcontainer/ai-container/README.md

@@ -0,0 +1,21 @@
+# AI Dev Container
+
+This container image powers the **AI (Container)** devcontainer configuration under `.devcontainer/ai-container`.
+
+## Building Locally
+
+### Docker / Buildx
+
+```bash
+docker buildx build --platform linux/amd64,linux/arm64/v8 -f Dockerfile -t ghcr.io/your-org/ai:latest .
+```
+
+### macOS container CLI
+
+On Apple Silicon hosts you can build a native arm64 variant with the macOS `container` CLI:
+
+```bash
+container build --build-arg TARGETARCH=arm64 --platform linux/arm64/v8 --file Dockerfile .
+```
+
+Adjust the tag or output options (`--tag`, `--output`) to suit your workflow.

.devcontainer/codex-container/Dockerfile

@@ -1,9 +1,17 @@
 # Use a minimal base image designed for dev containers
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
+ARG TARGETARCH=amd64
+ENV GO_VERSION=1.25.0
+
 # Install Go
 # Install latest Go version
-RUN wget -q -O go.tar.gz https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \
+RUN case "${TARGETARCH}" in \
+        amd64) GO_ARCH=amd64 ;; \
+        arm64) GO_ARCH=arm64 ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && wget -q -O go.tar.gz "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
     && tar -C /usr/local -xzf go.tar.gz \
     && rm go.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
@@ -23,4 +31,4 @@ RUN npm install -g @openai/codex
 ENV OPENAI_API_KEY=""
 
 # [Optional] Define a default command if you want the container to do something specific on startup
-CMD ["bash"]
+CMD ["bash"]

.devcontainer/default-container/Dockerfile

@@ -1,11 +1,19 @@
 # Use a minimal base image designed for dev containers
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
+ARG TARGETARCH=amd64
+ENV GO_VERSION=1.25.0
+
 # Install Go
 # Install any project-specific tools not available as Dev Container Features
 # Example: Installing a specific version of a tool
 # Install latest Go version
-RUN wget -q -O go.tar.gz https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \
+RUN case "${TARGETARCH}" in \
+        amd64) GO_ARCH=amd64 ;; \
+        arm64) GO_ARCH=arm64 ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && wget -q -O go.tar.gz "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
     && tar -C /usr/local -xzf go.tar.gz \
     && rm go.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
@@ -17,4 +25,4 @@ ENV PATH="/usr/local/go/bin:${PATH}"
 # ENV MY_CUSTOM_VAR="hello"
 
 # [Optional] Define a default command if you want the container to do something specific on startup
-# CMD ["bash"]
+# CMD ["bash"]

.devcontainer/llm-container/Dockerfile

@@ -1,8 +1,16 @@
 # Use a minimal base image designed for dev containers
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
+ARG TARGETARCH=amd64
+ENV GO_VERSION=1.25.0
+
 # Install Go (match default-container)
-RUN wget -q -O go.tar.gz https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \
+RUN case "${TARGETARCH}" in \
+        amd64) GO_ARCH=amd64 ;; \
+        arm64) GO_ARCH=arm64 ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && wget -q -O go.tar.gz "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
     && tar -C /usr/local -xzf go.tar.gz \
     && rm go.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"

.devcontainer/wassette-container/Dockerfile

@@ -1,8 +1,16 @@
 # Base devcontainer image
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
+ARG TARGETARCH=amd64
+ENV GO_VERSION=1.25.0
+
 # Install Go (match default-container)
-RUN wget -q -O go.tar.gz https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \
+RUN case "${TARGETARCH}" in \
+        amd64) GO_ARCH=amd64 ;; \
+        arm64) GO_ARCH=arm64 ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+    esac \
+    && wget -q -O go.tar.gz "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
     && tar -C /usr/local -xzf go.tar.gz \
     && rm go.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
@@ -15,11 +23,10 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends ca-certificates curl tar git; \
     rm -rf /var/lib/apt/lists/*; \
-    arch="$(uname -m)"; \
-    case "$arch" in \
-      x86_64|amd64) cpu="amd64" ;; \
-      aarch64|arm64) cpu="arm64" ;; \
-      *) echo "Unsupported architecture: $arch"; exit 1 ;; \
+    case "${TARGETARCH}" in \
+      amd64) cpu="amd64" ;; \
+      arm64) cpu="arm64" ;; \
+      *) echo "Unsupported architecture: ${TARGETARCH}"; exit 1 ;; \
     esac; \
     ver="${WASSETTE_VERSION#v}"; \
     asset="wassette_${ver}_linux_${cpu}.tar.gz"; \
@@ -38,4 +45,3 @@ CMD ["bash"]
 # Provide a default MCP config inside the image for VS Code
 # The devcontainer.json will copy this into the workspace's .vscode on create if missing
 COPY mcp.json /opt/wassette/mcp.json
-

.github/workflows/build-all-devcontainers.yml

@@ -85,6 +85,7 @@ jobs:
         with:
           context: ./.devcontainer/${{ matrix.devcontainer }}
           file: ./.devcontainer/${{ matrix.devcontainer }}/Dockerfile
+          platforms: linux/amd64,linux/arm64/v8
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -94,4 +95,4 @@ jobs:
       - name: Output image details
         run: |
           echo "Built devcontainer: ${{ matrix.devcontainer }}"
-          echo "Tags: ${{ steps.meta.outputs.tags }}"
+          echo "Tags: ${{ steps.meta.outputs.tags }}"

.github/workflows/build-single-devcontainer.yml

@@ -64,6 +64,7 @@ jobs:
         with:
           context: ./.devcontainer/${{ github.event.inputs.devcontainer_choice }}
           file: ./.devcontainer/${{ github.event.inputs.devcontainer_choice }}/Dockerfile
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}