From 4b0fa4140834193e8fefeb96fc9e0263e651967f Mon Sep 17 00:00:00 2001
From: "Matt H." <matt_henderson@sil.org>
Date: Mon, 2 Dec 2024 15:58:48 -0500
Subject: [PATCH 1/2] Specify `platform` for non-cross-platform docker images
 (for local dev)

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 1fa67a9..838f6b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,6 +59,7 @@ services:
 
   test-browser:
     image: justinribeiro/chrome-headless:stable
+    platform: linux/amd64
     ports:
       - "9222:9222"
     cap_add:
@@ -258,6 +259,7 @@ services:
 
   ssp-sp1.local:
     image: silintl/ssp-base:9.3.0
+    platform: linux/amd64
     volumes:
       # Utilize custom certs
       - ./development/sp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
@@ -284,6 +286,7 @@ services:
 
   ssp-sp2.local:
     image: silintl/ssp-base:9.3.0
+    platform: linux/amd64
     volumes:
       # Utilize custom certs
       - ./development/sp2-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
@@ -307,6 +310,7 @@ services:
 
   ssp-sp3.local:
     image: silintl/ssp-base:9.3.0
+    platform: linux/amd64
     volumes:
       # Utilize custom certs
       - ./development/sp3-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
@@ -332,6 +336,7 @@ services:
 
   pwmanager.local:
     image: silintl/ssp-base:9.3.0
+    platform: linux/amd64
     volumes:
       # Utilize custom certs
       - ./development/sp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
@@ -354,6 +359,7 @@ services:
   # the broker and brokerDb containers are used by the silauth module
   broker:
     image: silintl/idp-id-broker:latest
+    platform: linux/amd64
     ports:
       - "80"
     depends_on:
@@ -413,6 +419,7 @@ services:
 
   dynamo:
     image: cnadiminti/dynamodb-local
+    platform: linux/amd64
     command: "-sharedDb -inMemory"
     hostname: dynamo
     ports:
@@ -422,6 +429,7 @@ services:
 
   init-dynamo:
     image: garland/aws-cli-docker
+    platform: linux/amd64
     command: "/init-dynamodb.sh"
     volumes:
       - ./development/init-dynamodb.sh:/init-dynamodb.sh

From 88816f3ce4afc08aadb34834f551422749aff076 Mon Sep 17 00:00:00 2001
From: "Matt H." <matt_henderson@sil.org>
Date: Mon, 2 Dec 2024 16:00:11 -0500
Subject: [PATCH 2/2] Increase timeout when tests are waiting for local IDP to
 start up

---
 dockerbuild/run-integration-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerbuild/run-integration-tests.sh b/dockerbuild/run-integration-tests.sh
index 61c751f..ffe8b8e 100755
--- a/dockerbuild/run-integration-tests.sh
+++ b/dockerbuild/run-integration-tests.sh
@@ -9,7 +9,7 @@ set -e
 cd /data
 
 whenavail "ssp-hub.local"  80 15 echo Hub ready
-whenavail "ssp-idp1.local" 80 5 echo IDP 1 ready
+whenavail "ssp-idp1.local" 80 10 echo IDP 1 ready
 whenavail "ssp-sp1.local"  80 5 echo SP 1 ready
 
 ./vendor/bin/behat \