XRPLF · mathbunnyru · Jul 8, 2025
diff --git a/.github/actions/build_docker_image/action.yml b/.github/actions/build_docker_image/action.yml
@@ -12,13 +12,13 @@ inputs:
     description: The directory containing the Dockerfile
     required: true
   tags:
-    description: Comma separated tags to apply to the image
+    description: Newline separated tags to apply to the image
     required: true
   platforms:
     description: Platforms to build the image for (e.g. linux/amd64,linux/arm64)
     required: true
   build_args:
-    description: List of build-time variables
+    description: Newline separated list of build-time variables
     required: false
 
   dockerhub_repo:

diff --git a/.github/workflows/build_clio_docker_image.yml b/.github/workflows/build_clio_docker_image.yml
@@ -6,7 +6,7 @@ on:
       tags:
         required: true
         type: string
-        description: Comma separated tags for docker image
+        description: Newline separated tags for docker image
       artifact_name:
         type: string
         description: Name of Github artifact to put into docker image
@@ -24,7 +24,7 @@ on:
       tags:
         required: true
         type: string
-        description: Comma separated tags for docker image
+        description: Newline separated tags for docker image
       clio_server_binary_url:
         required: true
         type: string

diff --git a/.github/workflows/multiarch_image.yml b/.github/workflows/multiarch_image.yml
@@ -0,0 +1,132 @@
+name: Multi-architecture Docker Image Builder
+
+on:
+  workflow_call:
+    inputs:
+      image_name:
+        description: "Base name of the image"
+        required: true
+        type: string
+      directory:
+        description: "Directory containing the Dockerfile"
+        required: true
+        type: string
+      tags:
+        description: "Newline separated tags to apply to the image"
+        required: true
+        type: string
+      build_args:
+        description: "Additional build arguments for Docker"
+        required: false
+        type: string
+        default: ""
+
+env:
+  GHCR_REPO: ghcr.io/${{ github.repository_owner }}
+
+jobs:
+  build:
+    name: Build and push ${{ inputs.image_name }} image (${{ matrix.arch }})
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runs-on: heavy
+            platform: linux/amd64
+          - arch: arm64
+            runs-on: heavy-arm64
+            platform: linux/arm64
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: "${{ inputs.directory }}/**"
+
+      - name: Prepare tags
+        run: |
+          TAGS=""
+          while IFS= read -r tag
+          do
+            # Remove leading and trailing whitespace
+            tag=$(echo "$tag" | xargs)
+            # Skip empty tags
+            if [ -z "$tag" ]; then
+              continue
+            fi
+            TAGS="type=raw,value=${{ matrix.arch }}-$tag\n$TAGS"
+          done < <(printf '%s\n' "${{ inputs.tags }}")
+
+          echo "TAGS=$TAGS" >> $GITHUB_ENV
+
+      - uses: ./.github/actions/build_docker_image
+        if: steps.changed-files.outputs.any_changed == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          images: |
+            ${{ env.GHCR_REPO }}/${{ inputs.image_name }}
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: ${{ inputs.directory }}
+          tags: ${{ env.TAGS }}
+          platforms: ${{ matrix.platform }}
+          build_args: ${{ inputs.build_args }}
+
+  merge:
+    name: Merge and push multi-arch ${{ inputs.image_name }} image
+    runs-on: heavy
+    needs: build
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: "${{ inputs.directory }}/**"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Make GHCR_REPO lowercase
+        run: |
+          echo "GHCR_REPO_LC=$(echo ${{ env.GHCR_REPO }} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
+
+      - name: Prepare manifest arguments
+        run: |
+          MANIFEST_ARGS=""
+          echo "${{ inputs.tags }}" | while read -r tag; do
+            # Remove leading and trailing whitespace
+            tag=$(echo "$tag" | xargs)
+            # Skip empty tags
+            if [ -z "$tag" ]; then
+              continue
+            fi
+            while IFS= read -r image_tag; do
+              MANIFEST_ARGS="$MANIFEST_ARGS --amend ${{ env.GHCR_REPO_LC }}/${{ inputs.image_name }}:${image_tag}"
+            done < <(printf '%s\n' "${{ inputs.tags }}")
+          done
+
+          echo "MANIFEST_ARGS=$MANIFEST_ARGS" >> $GITHUB_ENV
+
+      - name: Create and push multi-arch manifest
+        if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
+        run: |
+          export image=${{ env.GHCR_REPO_LC }}/${{ inputs.image_name }}
+          docker buildx imagetools create \
+            $MANIFEST_ARGS \
+            $image:arm64-latest \
+            $image:amd64-latest