From e6709b0f5e363b526b3698c8de05effbfb22f3ea Mon Sep 17 00:00:00 2001
From: Anthony Atkinson <sha1sum@users.noreply.github.com>
Date: Mon, 18 Dec 2023 03:43:12 -0500
Subject: [PATCH] =?UTF-8?q?#308=20=E2=80=94=20Build=20docker=20image=20for?=
 =?UTF-8?q?=20both=20amd64=20and=20arm64=20(#311)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Build for both amd64 and arm64

* Moving line to retrigger Actions check

* Removal of the `platform` flag—let system choose

* Indicate to apt-get that there is no frontend
---
 .github/workflows/docker-build-push.yml | 1 +
 Dockerfile                              | 4 ++--
 makefile                                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 98cb137..c9065fd 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -49,6 +49,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 1f82e54..f910746 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN cat /etc/*release*
 
 # Install base depdendencies
 RUN apt-get update && \
-    apt-get install --yes -y --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt-get install --yes -y --no-install-recommends \
     sudo \
     make \
     tidy \
@@ -42,7 +42,7 @@ RUN apt-get update && \
 
 # Install TeX
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     texlive-full \
     texlive-luatex
 
diff --git a/makefile b/makefile
index bf393ec..61d1a06 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := build_pdf
 
 DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework
-DOCKER_CMD := docker run -it -v $(PWD):/opt/repo --platform linux/x86_64 $(DOCKER_IMAGE) /bin/bash -c
+DOCKER_CMD := docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c
 
 .PHONY: bake build_pdf build_docker_image push_docker_image validate website
 .PHONY: print_os_version start_shell printvars show_tools_version mrproper