From c6a98b3d0b63244f71dadf895d60011a5480a180 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <james@purplerock.ca>
Date: Sat, 1 Jun 2024 01:55:26 -0700
Subject: [PATCH] Merge branch 'feature/alpine-arm'

---
 .docker/Dockerfile.alpine   | 2 +-
 .github/workflows/build.yml | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
index e8ea913bf..3ab270787 100644
--- a/.docker/Dockerfile.alpine
+++ b/.docker/Dockerfile.alpine
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 James R. Barlow
 # SPDX-License-Identifier: MPL-2.0
 
-FROM alpine:3.19 as base
+FROM alpine:3.19.1 as base
 
 ENV LANG=C.UTF-8
 ENV TZ=UTC
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ad3719a5..61aaf2b28 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -358,9 +358,6 @@ jobs:
           username: jbarlow83
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
@@ -372,6 +369,6 @@ jobs:
         run: |
           docker buildx build \
             --push \
-            --platform linux/amd64  \
+            --platform linux/amd64,linux/arm64  \
             --tag "${DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
             --file .docker/Dockerfile.alpine .