From bc4aecfec9b47e6c9cc4581f701c047c6ce2fc76 Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Fri, 16 Jun 2023 11:10:31 -0400
Subject: [PATCH 1/5] Fix php-fpm PID check for php8.1

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2f1b15918..b45f6799d 100644
--- a/Makefile
+++ b/Makefile
@@ -114,6 +114,11 @@ CMD := $(shell [ $(IS_DRUPAL_PSSWD_FILE_READABLE) -eq 1 ] && echo 'tee' || echo
 
 LATEST_VERSION := $(shell curl -s https://api.github.com/repos/desandro/masonry/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/')
 
+PHP_FPM_PID=/var/run/php-fpm7/php-fpm7.pid
+ifeq ($(shell expr $(TAG) \>= 2.0), 1)
+	PHP_FPM_PID=/var/run/php-fpm81/php-fpm81.pid
+endif
+
 #############################################
 ## Default Rule                            ##
 #############################################
@@ -525,7 +530,7 @@ remove_standard_profile_references_from_config:
 ## Creates required databases for drupal site(s) using environment variables.
 .SILENT: drupal-database
 drupal-database:
-	docker compose exec -T drupal timeout 300 bash -c "while ! test -e /var/run/nginx/nginx.pid -a -e /var/run/php-fpm7/php-fpm7.pid; do sleep 1; done"
+	docker compose exec -T drupal timeout 300 bash -c "while ! test -e /var/run/nginx/nginx.pid -a -e $(PHP_FPM_PID); do echo 'Waiting for nginx and php-fpm'; sleep 1; done"
 	docker compose exec -T drupal with-contenv bash -lc "for_all_sites create_database"
 
 

From dc0fdc0e0ba263e7af1c445006f4697536f54b7d Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Wed, 20 Sep 2023 10:48:40 -0400
Subject: [PATCH 2/5] Update starter site tag to work with Drupal 10

---
 sample.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample.env b/sample.env
index 2fe530d60..1acc29035 100644
--- a/sample.env
+++ b/sample.env
@@ -49,7 +49,7 @@ CUSTOM_IMAGE_TAG=latest
 
 # Packagist repo to use when creating a site with make starter
 # Change this if you want to build from a different codebase than the starter site
-CODEBASE_PACKAGE=islandora/islandora-starter-site:0.8.0
+CODEBASE_PACKAGE=islandora/islandora-starter-site:1.1.0
 
 # Includes `traefik` as a service, if false assume we are sharing a traefik
 # from another project.

From e8473ba9375a2e1a9410665d647161be0d3003c6 Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Wed, 20 Sep 2023 10:49:39 -0400
Subject: [PATCH 3/5] Set TAG to v2.0.1

---
 sample.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample.env b/sample.env
index 1acc29035..5444b7aa9 100644
--- a/sample.env
+++ b/sample.env
@@ -94,7 +94,7 @@ REPOSITORY=islandora
 
 # The version of the isle-buildkit images, non isle-buildkit images have
 # their versions specified explicitly in their respective docker-compose files.
-TAG=1.0.10
+TAG=2.0.1
 
 ###############################################################################
 # Exposed Containers & Ports

From d6ad64aa2fc5fc6b8670f2ba03f86710ff3059b3 Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Fri, 22 Sep 2023 09:11:53 -0400
Subject: [PATCH 4/5] 2.0.2

---
 sample.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample.env b/sample.env
index 5444b7aa9..12e36c7d1 100644
--- a/sample.env
+++ b/sample.env
@@ -94,7 +94,7 @@ REPOSITORY=islandora
 
 # The version of the isle-buildkit images, non isle-buildkit images have
 # their versions specified explicitly in their respective docker-compose files.
-TAG=2.0.1
+TAG=2.0.2
 
 ###############################################################################
 # Exposed Containers & Ports

From abfc8493c973990151461ac21c9bf2fa4f0426fd Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Wed, 27 Sep 2023 11:24:05 -0400
Subject: [PATCH 5/5] 2.0.3

---
 sample.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample.env b/sample.env
index 12e36c7d1..c7429e2db 100644
--- a/sample.env
+++ b/sample.env
@@ -94,7 +94,7 @@ REPOSITORY=islandora
 
 # The version of the isle-buildkit images, non isle-buildkit images have
 # their versions specified explicitly in their respective docker-compose files.
-TAG=2.0.2
+TAG=2.0.3
 
 ###############################################################################
 # Exposed Containers & Ports