From c9f761e2533822bb5dd86add84050aa20a31d7d7 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Mon, 19 Jul 2021 14:15:33 +0200
Subject: [PATCH] Adjust runtime for PHP8 (#206)

---
 grocy/rootfs/etc/cont-init.d/php-fpm.sh                | 8 ++++----
 grocy/rootfs/etc/{php7 => php8}/conf.d/99-grocy.ini    | 0
 grocy/rootfs/etc/{php7 => php8}/php-fpm.d/.gitkeep     | 0
 grocy/rootfs/etc/{php7 => php8}/templates/php-fpm.gtpl | 0
 grocy/rootfs/etc/services.d/php-fpm/run                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename grocy/rootfs/etc/{php7 => php8}/conf.d/99-grocy.ini (100%)
 rename grocy/rootfs/etc/{php7 => php8}/php-fpm.d/.gitkeep (100%)
 rename grocy/rootfs/etc/{php7 => php8}/templates/php-fpm.gtpl (100%)

diff --git a/grocy/rootfs/etc/cont-init.d/php-fpm.sh b/grocy/rootfs/etc/cont-init.d/php-fpm.sh
index 48799b4..84cbb89 100644
--- a/grocy/rootfs/etc/cont-init.d/php-fpm.sh
+++ b/grocy/rootfs/etc/cont-init.d/php-fpm.sh
@@ -10,8 +10,8 @@ bashio::var.json \
     port "^9002" \
     base "$(bashio::addon.ingress_entry)" \
     | tempio \
-        -template /etc/php7/templates/php-fpm.gtpl \
-        -out /etc/php7/php-fpm.d/ingress.conf
+        -template /etc/php8/templates/php-fpm.gtpl \
+        -out /etc/php8/php-fpm.d/ingress.conf
 
 # Generate direct access configuration, if enabled.
 if bashio::var.has_value "$(bashio::addon.port 80)"; then
@@ -19,6 +19,6 @@ if bashio::var.has_value "$(bashio::addon.port 80)"; then
         name "www" \
         port "^9001" \
         | tempio \
-            -template /etc/php7/templates/php-fpm.gtpl \
-            -out /etc/php7/php-fpm.d/www.conf
+            -template /etc/php8/templates/php-fpm.gtpl \
+            -out /etc/php8/php-fpm.d/www.conf
 fi
diff --git a/grocy/rootfs/etc/php7/conf.d/99-grocy.ini b/grocy/rootfs/etc/php8/conf.d/99-grocy.ini
similarity index 100%
rename from grocy/rootfs/etc/php7/conf.d/99-grocy.ini
rename to grocy/rootfs/etc/php8/conf.d/99-grocy.ini
diff --git a/grocy/rootfs/etc/php7/php-fpm.d/.gitkeep b/grocy/rootfs/etc/php8/php-fpm.d/.gitkeep
similarity index 100%
rename from grocy/rootfs/etc/php7/php-fpm.d/.gitkeep
rename to grocy/rootfs/etc/php8/php-fpm.d/.gitkeep
diff --git a/grocy/rootfs/etc/php7/templates/php-fpm.gtpl b/grocy/rootfs/etc/php8/templates/php-fpm.gtpl
similarity index 100%
rename from grocy/rootfs/etc/php7/templates/php-fpm.gtpl
rename to grocy/rootfs/etc/php8/templates/php-fpm.gtpl
diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run
index 2267778..4d6ff04 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/run
+++ b/grocy/rootfs/etc/services.d/php-fpm/run
@@ -89,4 +89,4 @@ GROCY_CULTURE=$(bashio::config "culture")
 GROCY_CURRENCY=$(bashio::config "currency")
 GROCY_ENTRY_PAGE=$(bashio::config 'entry_page')
 
-exec php-fpm7 --nodaemonize
+exec php-fpm8 --nodaemonize