feat: modify existing workflows to build arm64 containers

.github/actions/bulk-pr-and-release-container/action.yaml

@@ -36,6 +36,10 @@ inputs:
     description: "KEY=VALUE build secrets from files as a multiline string."
     default: ''
 
+  platform:
+    description: "Platform to be passed to buildx"
+    default: 'linux/amd64'
+
   test-flags:
     description: "Arguments passed to docker run."
     default: ''
@@ -90,7 +94,7 @@ runs:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - if: github.event_name == 'pull_request'
-      uses: SwanseaUniversityMedical/workflows/.github/actions/pr-container@v2.2.0-pr-container-action
+      uses: SwanseaUniversityMedical/workflows/.github/actions/pr-container@feat/multiarch-builds
       with:
         name: ${{ inputs.name }}
         comment-enabled: ${{ inputs.comment-pr }}
@@ -105,6 +109,7 @@ runs:
         build-secrets: ${{ inputs.build-secrets }}
         build-secret-envs: ${{ inputs.build-secret-envs }}
         build-secret-files: ${{ inputs.build-secret-files }}
+        platform: ${{ inputs.platform }}
         test-flags: ${{ inputs.test-flags }}
         test-args: ${{ inputs.test-args }}
         platforms: ${{ inputs.platforms }}
@@ -129,11 +134,10 @@ runs:
         build-secrets: ${{ inputs.build-secrets }}
         build-secret-envs: ${{ inputs.build-secret-envs }}
         build-secret-files: ${{ inputs.build-secret-files }}
+        platform: ${{ inputs.platform }}
         test-flags: ${{ inputs.test-flags }}
         test-args: ${{ inputs.test-args }}
         platforms: ${{ inputs.platforms }}
         cosign-public-key: ${{ inputs.cosign-public-key }}
         cosign-private-key: ${{ inputs.cosign-private-key }}
         cosign-password: ${{ inputs.cosign-password }}
-
-

.github/actions/bulk-release-container/action.yaml

@@ -36,6 +36,10 @@ inputs:
     description: "KEY=VALUE build secrets from files as a multiline string."
     default: ''
 
+  platform:
+    description: "Platform to be passed to buildx"
+    default: 'linux/amd64'
+
   test-flags:
     description: "Arguments passed to docker run."
     default: ''
@@ -210,6 +214,7 @@ runs:
         push: true
         github-token: ${{ github.token }}
         provenance: true
+        platforms: ${{ inputs.platform }}
         cache-to: type=inline
         cache-from: |
           type=registry,ref=${{ steps.pr-meta.outputs.tags }}
@@ -348,6 +353,7 @@ runs:
         push: true
         github-token: ${{ github.token }}
         provenance: true
+        platforms: ${{ inputs.platform }}
         cache-from: |
           type=registry,ref=${{ steps.pr-meta.outputs.tags }}
           type=registry,ref=${{ steps.rc-meta.outputs.tags }}

.github/actions/pr-and-release-container/action.yaml

@@ -36,6 +36,10 @@ inputs:
     description: "KEY=VALUE build secrets from files as a multiline string."
     default: ''
 
+  platform:
+    description: "Platform to be passed to buildx"
+    default: 'linux/amd64'
+
   test-flags:
     description: "Arguments passed to docker run."
     default: ''
@@ -95,7 +99,7 @@ runs:
         name: ${{ inputs.name }}
 
     - if: github.event_name == 'pull_request'
-      uses: SwanseaUniversityMedical/workflows/.github/actions/pr-container@v2.2.0-pr-container-action
+      uses: SwanseaUniversityMedical/workflows/.github/actions/pr-container@feat/multiarch-builds
       with:
         name: ${{ inputs.name }}
         comment-enabled: ${{ inputs.comment-pr }}
@@ -109,6 +113,7 @@ runs:
         build-secrets: ${{ inputs.build-secrets }}
         build-secret-envs: ${{ inputs.build-secret-envs }}
         build-secret-files: ${{ inputs.build-secret-files }}
+        platform: ${{ inputs.platform }}
         test-flags: ${{ inputs.test-flags }}
         test-args: ${{ inputs.test-args }}
         platforms: ${{ inputs.platforms }}
@@ -133,6 +138,7 @@ runs:
         build-secrets: ${{ inputs.build-secrets }}
         build-secret-envs: ${{ inputs.build-secret-envs }}
         build-secret-files: ${{ inputs.build-secret-files }}
+        platform: ${{ inputs.platform }}
         test-flags: ${{ inputs.test-flags }}
         test-args: ${{ inputs.test-args }}
         platforms: ${{ inputs.platforms }}

.github/actions/pr-container/action.yaml

@@ -40,6 +40,10 @@ inputs:
     description: "KEY=VALUE build secrets from files as a multiline string."
     default: ''
 
+  platform:
+    description: "Platform to be passed to buildx"
+    default: 'linux/amd64'
+
   test-flags:
     description: "Arguments passed to docker run."
     default: ''
@@ -195,6 +199,7 @@ runs:
         github-token: ${{ github.token }}
         provenance: true
         cache-to: type=inline
+        platforms: ${{ inputs.platform }}
         cache-from: |
           type=registry,ref=${{ steps.meta.outputs.tags }}
           type=registry,ref=${{ steps.rc-recent-meta.outputs.tags }}

.github/actions/release-container/action.yaml

@@ -36,6 +36,10 @@ inputs:
     description: "KEY=VALUE build secrets from files as a multiline string."
     default: ''
 
+  platform:
+    description: "Platform to be passed to buildx"
+    default: 'linux/amd64'
+
   test-flags:
     description: "Arguments passed to docker run."
     default: ''
@@ -236,6 +240,7 @@ runs:
         github-token: ${{ github.token }}
         platforms: ${{ inputs.platforms }}
         provenance: true
+        platforms: ${{ inputs.platform }}
         cache-to: type=inline
         cache-from: |
           type=registry,ref=${{ steps.pr-meta.outputs.tags }}
@@ -374,6 +379,7 @@ runs:
         platforms: ${{ inputs.platforms }}
         github-token: ${{ github.token }}
         provenance: true
+        platforms: ${{ inputs.platform }}
         cache-from: |
           type=registry,ref=${{ steps.pr-meta.outputs.tags }}
           type=registry,ref=${{ steps.rc-meta.outputs.tags }}

.github/workflows/bulk-pr-and-release-container.yaml

@@ -42,6 +42,11 @@ on:
         default: ''
         type: string
 
+      platform:
+        description: "Platform to be passed to buildx"
+        default: 'linux/amd64'
+        type: string
+
       test-flags:
         description: "Arguments passed to docker run."
         default: ''
@@ -77,6 +82,11 @@ on:
         default: ''
         type: string
 
+      runner-label:
+        description: "Label for runner target"
+        default: 'x64'
+        type: string
+
       cosign-public-key:
         description: "Public key for cosigning images."
         required: false
@@ -107,10 +117,10 @@ on:
 jobs:
   container:
     runs-on:
-      labels: [ self-hosted, linux, x64 ]
+      labels: [ self-hosted, linux, "${{ inputs.runner-label }}" ]
       group: heavy
     steps:
-      - uses: SwanseaUniversityMedical/workflows/.github/actions/bulk-pr-and-release-container@v2.1.0-bulk-pr-and-release-container-action
+      - uses: SwanseaUniversityMedical/workflows/.github/actions/bulk-pr-and-release-container@feat/multiarch-builds
         with:
           name: ${{ inputs.job-name }}
           comment-pr: ${{ inputs.comment-pr }}
@@ -127,6 +137,7 @@ jobs:
           build-secrets: ${{ secrets.build-secrets }}
           build-secret-envs: ${{ inputs.build-secret-envs }}
           build-secret-files: ${{ inputs.build-secret-files }}
+          platform: ${{ inputs.platform }}
           test-flags: ${{ inputs.test-flags }}
           test-args: ${{ inputs.test-args }}
           platforms: ${{ inputs.platforms }}

.github/workflows/pr-and-release-container.yaml

@@ -42,6 +42,11 @@ on:
         default: ''
         type: string
 
+      platform:
+        description: "Platform to be passed to buildx"
+        default: 'linux/amd64'
+        type: string
+
       test-flags:
         description: "Arguments passed to docker run."
         default: ''
@@ -77,6 +82,11 @@ on:
         default: ''
         type: string
 
+      runner-label:
+        description: "Label for runner target"
+        default: 'x64'
+        type: string
+
       cosign-public-key:
         description: "Public key for cosigning images."
         required: false
@@ -108,10 +118,10 @@ on:
 jobs:
   container:
     runs-on:
-      labels: [ self-hosted, linux, x64 ]
+      labels: [ self-hosted, linux, "${{ inputs.runner-label }}" ]
       group: heavy
     steps:
-      - uses: SwanseaUniversityMedical/workflows/.github/actions/pr-and-release-container@v3.1.0-pr-and-release-container-action
+      - uses: SwanseaUniversityMedical/workflows/.github/actions/pr-and-release-container@feat/multiarch-builds
         with:
           name: ${{ inputs.job-name }}
           comment-pr: ${{ inputs.comment-pr }}
@@ -128,7 +138,7 @@ jobs:
           build-secrets: ${{ secrets.build-secrets }}
           build-secret-envs: ${{ inputs.build-secret-envs }}
           build-secret-files: ${{ inputs.build-secret-files }}
-          platforms: ${{ inputs.platforms }}
+          platform: ${{ inputs.platform }}
           test-flags: ${{ inputs.test-flags }}
           test-args: ${{ inputs.test-args }}
           cosign-public-key: ${{ inputs.cosign-public-key }}