From fe363e152a1117ddc0e5fa2840d46d66a68f8fdf Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Wed, 29 Jan 2025 12:42:30 -0500
Subject: [PATCH] Upgrade to PHP 8.4, make use of custom version optional

Re #1
---
 .env.sample         | 12 ++++++++----
 compose.version.yml |  6 ++++++
 compose.yml         |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 compose.version.yml

diff --git a/.env.sample b/.env.sample
index 485cbfb..f868865 100644
--- a/.env.sample
+++ b/.env.sample
@@ -4,19 +4,23 @@ DOMAIN=example.com
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.example.com`'
 LETS_ENCRYPT_ENV=production
+COMPOSE_FILE=compose.yml
 
 ROOT_PATH=/var/www/html
-PHP_VERSION=7.4
 # environment (needed for PHP frameworks like laravel/symphony)
 APP_ENV=prod
 
+## Optional: Specify alternative PHP version
+#COMPOSE_FILE=$COMPOSE_FILE:compose.version.yml
+#PHP_VERSION=7.4-fpm-alpine
+
 ## Extra extensions you need (run `abra app YOURAPPDOMAIN run app "php -m"` to see active extensions)
 PHP_EXTENSIONS="pdo_mysql"
 ## Install libxslt, required for PHP `xsl` extension
 #INSTALL_XSL=1
 
 # Optional database
-#COMPOSE_FILE="compose.yml:compose.mariadb.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
 # Optionally override database name and password
@@ -25,12 +29,12 @@ SECRET_DB_PASSWORD_VERSION=v1
 
 
 # Local SMTP relay
-#COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mailrelay.yml"
 #SMTP_HOST="postfix_relay_app"
 #MAIL_FROM="site@example.com"
 
 # Remote SMTP relay
-#COMPOSE_FILE="compose.yml:compose.mailrelay.yml:compose.smtp.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mailrelay.yml:compose.smtp.yml"
 #SMTP_HOST="mail.example.com"
 #MAIL_FROM="site@example.com"
 #SMTP_PORT=587
diff --git a/compose.version.yml b/compose.version.yml
new file mode 100644
index 0000000..6cf379f
--- /dev/null
+++ b/compose.version.yml
@@ -0,0 +1,6 @@
+---
+version: "3.8"
+
+services:
+  app:
+    image: php:${PHP_VERSION}
diff --git a/compose.yml b/compose.yml
index 52c1dce..79f17a2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   app:
-    image: php:${PHP_VERSION}-fpm-alpine3.13
+    image: php:8.4.3-fpm-alpine3.20
     volumes:
       - "site_content:/var/www/html/"
     networks: