From 64719bffff9deecb584303ab5172120f46cb291c Mon Sep 17 00:00:00 2001
From: "Matt H." <matt_henderson@sil.org>
Date: Wed, 8 Jan 2025 11:33:18 -0500
Subject: [PATCH 1/2] Use the standard, cross-platform phpMyAdmin Docker image

---
 docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 278f8f77..3668381a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *db_healthcheck
 
   phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
+    image: phpmyadmin:5
     ports:
       - "51151:80"
     environment:
@@ -163,7 +163,7 @@ services:
     <<: *db_healthcheck
 
   emailpma:
-    image: phpmyadmin/phpmyadmin:latest
+    image: phpmyadmin:5
     ports:
       - "51152:80"
     environment:
@@ -184,7 +184,7 @@ services:
     <<: *db_healthcheck
 
   brokerpma:
-    image: phpmyadmin/phpmyadmin:latest
+    image: phpmyadmin:5
     ports:
       - "51158:80"
     environment:

From 08af13aa43f92b7728e1be41543205a8c7688782 Mon Sep 17 00:00:00 2001
From: "Matt H." <matt_henderson@sil.org>
Date: Wed, 8 Jan 2025 11:33:52 -0500
Subject: [PATCH 2/2] For Docker images that only have a linux/amd64 version,
 use that

---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3668381a..27071f2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,6 +129,7 @@ services:
 
   email:
     image: silintl/email-service:1
+    platform: linux/amd64
     depends_on:
       emaildb:
         condition: service_healthy
@@ -173,6 +174,7 @@ services:
 
   zxcvbn:
     image: wcjr/zxcvbn-api:1.1.0
+    platform: linux/amd64
 
   brokerDb:
     image: mariadb:10
@@ -194,6 +196,7 @@ services:
 
   broker:
     image: silintl/idp-id-broker:6
+    platform: linux/amd64
     ports:
       - "51154:80"
     depends_on:
@@ -249,6 +252,7 @@ services:
 
   raml2html:
     image: mattjtodd/raml2html
+    platform: linux/amd64
     volumes:
       - ./api.raml:/api.raml
       - ./api.html:/api.html