Merge remote-tracking branch 'upstream/master' into trusted-publishing

.github/workflows/pull_requests.yml

@@ -35,20 +35,20 @@ jobs:
         if: success()
         run: npx grunt prod
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Production Image Build
         if: success()
         id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: docker/build-push-action@v6
         with:
           # Not being uploaded to any registry, use a simple name to allow Buildah to build correctly.
           image: cyberchef
-          containerfiles: ./Dockerfile
-          platforms: linux/amd64
-          oci: true
-          # Webpack seems to use a lot of open files, increase the max open file limit to accomodate.
-          extra-args: |
-            --ulimit nofile=10000
-
+          platforms: linux/amd64,linux/arm64
       - name: UI Tests
         if: success()
         run: |

.github/workflows/releases.yml

@@ -50,9 +50,15 @@ jobs:
           sudo apt-get install xvfb
           xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Image Metadata
         id: image-metadata
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -60,30 +66,22 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{version}}
 
-      - name: Production Image Build
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
         with:
-          tags: ${{ steps.image-metadata.outputs.tags }}
-          labels: ${{ steps.image-metadata.outputs.labels }}
-          containerfiles: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          oci: true
-          # enable build layer caching between platforms
-          layers: true
-          # Webpack seems to use a lot of open files, increase the max open file limit to accomodate.
-          extra-args: |
-            --ulimit nofile=10000
-
-      - name: Publish to GHCR
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
           registry: ${{ env.REGISTRY }}
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
 
+      - name: Publish to GHCR
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.image-metadata.outputs.tags }}
+          labels: ${{ steps.image-metadata.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+
       - name: Upload Release Assets
         id: upload-release-assets
         uses: svenstaro/upload-release-action@v2

Dockerfile

@@ -27,9 +27,6 @@ RUN npm run build
 #########################################
 # Package static build files into nginx #
 #########################################
-# We are using Github Actions: redhat-actions/buildah-build@v2 which needs manual selection of arch in base image
-# Remove TARGETARCH if docker buildx is supported in the CI release as --platform=$TARGETPLATFORM will be automatically set
-ARG TARGETPLATFORM
-FROM --platform=${TARGETPLATFORM} nginx:stable-alpine AS cyberchef
+FROM nginx:stable-alpine AS cyberchef
 
 COPY --from=builder /app/build/prod /usr/share/nginx/html/