From 67a0ac1f2aef685d0181f07882d36422b09fc994 Mon Sep 17 00:00:00 2001
From: Danny Rorabaugh <imnasnainaec@gmail.com>
Date: Fri, 8 Nov 2024 08:59:34 -0500
Subject: [PATCH] More build experiments

---
 .github/actions/combine-build/action.yml | 3 +++
 .github/workflows/database.yml           | 2 ++
 .github/workflows/frontend.yml           | 2 ++
 .github/workflows/maintenance.yml        | 2 ++
 Backend/Dockerfile                       | 4 ++--
 database/Dockerfile                      | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/actions/combine-build/action.yml b/.github/actions/combine-build/action.yml
index c263915e6b..e532211c6a 100644
--- a/.github/actions/combine-build/action.yml
+++ b/.github/actions/combine-build/action.yml
@@ -54,6 +54,9 @@ runs:
         username: ${{ inputs.aws_access_key_id }}
         password: ${{ inputs.aws_secret_access_key }}
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 97a095e818..49bc147084 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -33,6 +33,8 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build database image
         run: |
           deploy/scripts/build.py --components database --arch ${{ matrix.arch }}
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 05ad394272..d7d72fa92b 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -136,6 +136,8 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build frontend
         run: |
           deploy/scripts/build.py --components frontend --arch ${{ matrix.arch }}
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
index 62ef4dc045..f0c2b68109 100644
--- a/.github/workflows/maintenance.yml
+++ b/.github/workflows/maintenance.yml
@@ -39,6 +39,8 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build maintenance image
         run: |
           deploy/scripts/build.py --components maintenance --arch ${{ matrix.arch }}
diff --git a/Backend/Dockerfile b/Backend/Dockerfile
index 8580dc0e91..2e7a5b7faa 100644
--- a/Backend/Dockerfile
+++ b/Backend/Dockerfile
@@ -7,7 +7,7 @@
 ############################################################
 
 # Docker multi-stage build
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.402-jammy AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.402-jammy AS builder
 WORKDIR /app
 
 # Copy csproj and restore (fetch dependencies) as distinct layers.
@@ -19,7 +19,7 @@ COPY . ./
 RUN dotnet publish -c Release -o build
 
 # Build runtime image.
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0.8-jammy
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.8-jammy
 
 ENV ASPNETCORE_URLS=http://+:5000
 ENV COMBINE_IS_IN_CONTAINER=1
diff --git a/database/Dockerfile b/database/Dockerfile
index 72ff5ab878..778443a6fc 100644
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -5,7 +5,7 @@
 #   - Intel/AMD 64-bit
 #   - ARM 64-bit
 ############################################################
-FROM --platform=$BUILDPLATFORM mongo:7.0.14-jammy
+FROM mongo:7.0.14-jammy
 
 WORKDIR /