From d905beb1c1c0876781b092071326dadbd04ec13e Mon Sep 17 00:00:00 2001
From: Danny Rorabaugh <imnasnainaec@gmail.com>
Date: Fri, 25 Oct 2024 12:07:15 -0400
Subject: [PATCH] See if --platform is necessary

---
 .github/workflows/deploy_qa.yml   | 2 +-
 .github/workflows/maintenance.yml | 2 +-
 Backend/Dockerfile                | 4 ++--
 Dockerfile                        | 6 +++---
 database/Dockerfile               | 2 +-
 maintenance/Dockerfile            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index e1b7bcce2f..0f1e158d13 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -2,7 +2,7 @@ name: "Deploy Update to QA Server"
 
 on:
   push:
-    branches: [master]
+    branches: [arm, master]
 
 permissions:
   contents: read
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
index 0b32504aa6..33c0b3ed76 100644
--- a/.github/workflows/maintenance.yml
+++ b/.github/workflows/maintenance.yml
@@ -23,8 +23,8 @@ jobs:
           disable-sudo: true
           egress-policy: block
           allowed-endpoints: >
-            auth.docker.io:443
             archive.ubuntu.com:80
+            auth.docker.io:443
             files.pythonhosted.org:443
             github.com:443
             production.cloudflare.docker.com:443
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/Dockerfile b/Dockerfile
index 7310841115..74acc47977 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@
 ############################################################
 
 # User guide build environment
-FROM --platform=$BUILDPLATFORM python:3.12.5-slim-bookworm AS user_guide_builder
+FROM python:3.12.5-slim-bookworm AS user_guide_builder
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
@@ -24,7 +24,7 @@ COPY docs/user_guide docs/user_guide
 RUN tox -e user-guide
 
 # Frontend build environment.
-FROM --platform=$BUILDPLATFORM node:20.17.0-bookworm-slim AS frontend_builder
+FROM node:20.17.0-bookworm-slim AS frontend_builder
 WORKDIR /app
 
 # Install app dependencies.
@@ -36,7 +36,7 @@ COPY . ./
 RUN npm run build
 
 # Production environment.
-FROM --platform=$BUILDPLATFORM nginx:1.27
+FROM nginx:1.27
 
 WORKDIR /app
 
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 /
 
diff --git a/maintenance/Dockerfile b/maintenance/Dockerfile
index 41b53d72bc..9e86310ad8 100644
--- a/maintenance/Dockerfile
+++ b/maintenance/Dockerfile
@@ -16,7 +16,7 @@
 #   - ARM 64-bit
 ############################################################
 
-FROM --platform=$BUILDPLATFORM sillsdev/aws-kubectl:0.3.0
+FROM sillsdev/aws-kubectl:0.3.0
 
 USER root