From 09a95f48c0f2975491d908b806f5e1ce752050ab Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <shu@vanwa.ch>
Date: Mon, 31 Mar 2025 13:16:53 +0200
Subject: [PATCH] use alpiune 3.21 with php 8.4

---
 Containerfile                                          | 4 ++--
 rootfs/etc/confd/conf.d/00_memory_limit.ini.toml       | 2 +-
 rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml | 2 +-
 rootfs/etc/confd/conf.d/02_opcache.ini.toml            | 2 +-
 rootfs/etc/confd/conf.d/www.conf.toml                  | 2 +-
 rootfs/etc/{php83 => php84}/php-fpm.conf               | 4 ++--
 rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename rootfs/etc/{php83 => php84}/php-fpm.conf (98%)

diff --git a/Containerfile b/Containerfile
index fa2c956..50cee1d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,5 @@
-FROM docker.io/thallian/confd-env:3.20-3.1.6.2
+FROM docker.io/thallian/confd-env:3.21-3.2.0.2
 
-RUN apk --no-cache add php83-fpm
+RUN apk --no-cache add php84-fpm
 
 ADD /rootfs /
diff --git a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
index 777bd9d..3333da1 100644
--- a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
+++ b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "00_memory_limit.ini.tmpl"
-dest = "/etc/php83/conf.d/00_memory_limit.ini"
+dest = "/etc/php84/conf.d/00_memory_limit.ini"
diff --git a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
index f8c1982..fb44427 100644
--- a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
+++ b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "01_max_execution_time.ini.tmpl"
-dest = "/etc/php83/conf.d/01_max_execution_time.ini"
+dest = "/etc/php84/conf.d/01_max_execution_time.ini"
diff --git a/rootfs/etc/confd/conf.d/02_opcache.ini.toml b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
index 229cbb6..5240fe2 100644
--- a/rootfs/etc/confd/conf.d/02_opcache.ini.toml
+++ b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "02_opcache.ini.tmpl"
-dest = "/etc/php83/conf.d/02_opcache.ini"
+dest = "/etc/php84/conf.d/02_opcache.ini"
diff --git a/rootfs/etc/confd/conf.d/www.conf.toml b/rootfs/etc/confd/conf.d/www.conf.toml
index 5fa47c8..c32277e 100644
--- a/rootfs/etc/confd/conf.d/www.conf.toml
+++ b/rootfs/etc/confd/conf.d/www.conf.toml
@@ -1,3 +1,3 @@
 [template]
 src = "www.conf.tmpl"
-dest = "/etc/php83/php-fpm.d/www.conf"
+dest = "/etc/php84/php-fpm.d/www.conf"
diff --git a/rootfs/etc/php83/php-fpm.conf b/rootfs/etc/php84/php-fpm.conf
similarity index 98%
rename from rootfs/etc/php83/php-fpm.conf
rename to rootfs/etc/php84/php-fpm.conf
index 1947ddf..5a5c0df 100644
--- a/rootfs/etc/php83/php-fpm.conf
+++ b/rootfs/etc/php84/php-fpm.conf
@@ -14,7 +14,7 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-;pid = run/php83-fpm.pid
+;pid = run/php84-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -122,4 +122,4 @@ error_log = syslog
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php83/php-fpm.d/*.conf
+include=/etc/php84/php-fpm.d/*.conf
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
index a849bc5..222429e 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php-fpm83 --nodaemonize --force-stderr
+exec php-fpm84 --nodaemonize --force-stderr