From c69afc0a632730651ccda7e45c998c045a98bbb8 Mon Sep 17 00:00:00 2001
From: Miraty <miraty+git@antopie.org>
Date: Wed, 22 Jan 2025 21:34:08 +0100
Subject: [PATCH] create variable for php version + upgrade to php 8.4

---
 README.md         |  2 +-
 base.yaml         |  8 +++++---
 conf/cronie       |  6 +++---
 php.Containerfile | 24 +++++++++++++-----------
 upstream.sh       |  1 +
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 130aeb4..a76b17a 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ podman-compose --profile=secondary up knot knot-secondary # generate QUIC keys
 
 ```shell
 podman-compose up # start containers
-podman-compose exec core php /srv/servnest/core/jobs/check.php # test main features
+podman-compose exec core sh -c 'php$PHP_VERSION /srv/servnest/core/jobs/check.php' # test main features
 ```
 
 When running `up`, the only expected error messages are:
diff --git a/base.yaml b/base.yaml
index 187da6c..d5e1e56 100644
--- a/base.yaml
+++ b/base.yaml
@@ -25,6 +25,8 @@ services:
     extends:
       service: base
     build:
+      args:
+        PHP_VERSION: $PHP_VERSION
       dockerfile: php.Containerfile
     group_add:
       - knot
@@ -36,8 +38,8 @@ services:
     volumes:
       - ./core/:/srv/servnest/core/:ro
       - ./core/db/:/srv/servnest/core/db/:rw
-      - ./conf/php.ini:/etc/php83/conf.d/servnest.ini:ro
-      - ./conf/php-fpm.conf:/etc/php83/php-fpm.d/servnest.conf:ro
+      - ./conf/php.ini:/etc/php$PHP_VERSION/conf.d/servnest.ini:ro
+      - ./conf/php-fpm.conf:/etc/php$PHP_VERSION/php-fpm.d/servnest.conf:ro
       - ./conf/sudoers:/etc/sudoers.d/servnest:ro
       - ./conf/certbot.ini:/etc/letsencrypt/servnest.ini:ro
       - ./conf/certbot-deploy-hook.sh:/root/certbot-deploy-hook.sh:ro
@@ -53,7 +55,7 @@ services:
       - ./sock/tor-control/:/run/tor-control/:rw
       - ./sock/knot/:/run/knot/:rw
       - ./sock/knot-secondary/:/run/knot-secondary/:rw
-      - ./logs/php/:/var/log/php83/:rw
+      - ./logs/php/:/var/log/php$PHP_VERSION/:rw
       - ./logs/certbot/:/var/log/letsencrypt/:rw
       - ./tmp/acme/:/srv/servnest/acme/:rw
       - ./tmp/certbot/:/var/lib/letsencrypt/:rw
diff --git a/conf/cronie b/conf/cronie
index ff17294..dc03812 100644
--- a/conf/cronie
+++ b/conf/cronie
@@ -1,4 +1,4 @@
-48 0,6,12,18 * * * root echo "ns-sync: $(sudo -u servnest php83 /srv/servnest/core/jobs/ns-sync.php)" | ts >> /var/log/cronie/ns-sync.log 2>&1
-14 4 * * * root echo "reg-cds: $(sudo -u servnest php83 /srv/servnest/core/jobs/reg-cds.php)" | ts >> /var/log/cronie/reg-cds.log 2>&1
-34 4 * * * root echo "reg-csync: $(sudo -u servnest php83 /srv/servnest/core/jobs/reg-csync.php)" | ts >> /var/log/cronie/reg-csync.log 2>&1
+48 0,6,12,18 * * * root echo "ns-sync: $(sudo -u servnest php$PHP_VERSION /srv/servnest/core/jobs/ns-sync.php)" | ts >> /var/log/cronie/ns-sync.log 2>&1
+14 4 * * * root echo "reg-cds: $(sudo -u servnest php$PHP_VERSION /srv/servnest/core/jobs/reg-cds.php)" | ts >> /var/log/cronie/reg-cds.log 2>&1
+34 4 * * * root echo "reg-csync: $(sudo -u servnest php$PHP_VERSION /srv/servnest/core/jobs/reg-csync.php)" | ts >> /var/log/cronie/reg-csync.log 2>&1
 24 11 * * * root echo "certbot renew: $(certbot renew)" | ts >> /var/log/cronie/certbot-renew.log 2>&1
diff --git a/php.Containerfile b/php.Containerfile
index 9f618c7..f794aad 100644
--- a/php.Containerfile
+++ b/php.Containerfile
@@ -1,14 +1,16 @@
 FROM a.invalid/servnest/alpine
+ARG PHP_VERSION
+ENV PHP_VERSION=$PHP_VERSION
 RUN apk add \
-	php83 \
-	php83-fpm \
-	php83-curl \
-	php83-gettext \
-	php83-opcache \
-	php83-pdo \
-	php83-pdo_sqlite \
-	php83-session \
-	php83-sodium \
+	php$PHP_VERSION \
+	php$PHP_VERSION-fpm \
+	php$PHP_VERSION-curl \
+	php$PHP_VERSION-gettext \
+	php$PHP_VERSION-opcache \
+	php$PHP_VERSION-pdo \
+	php$PHP_VERSION-pdo_sqlite \
+	php$PHP_VERSION-session \
+	php$PHP_VERSION-sodium \
 	certbot \
 	bash \
 	sudo \
@@ -23,6 +25,6 @@ RUN apk add \
 #RUN sqlite3 /srv/servnest/core/db/servnest.db < /srv/servnest/core/db/schema.sql
 #RUN echo "UPDATE params SET value = '$(openssl rand -hex 16)' WHERE name = 'username_salt';" | sqlite3 /srv/servnest/core/db/servnest.db
 #RUN msgfmt /srv/servnest/core/locales/fr/C/LC_MESSAGES/messages.po -o /srv/servnest/core/locales/fr/C/LC_MESSAGES/messages.mo
-RUN rm /etc/php83/php-fpm.d/www.conf
+RUN rm /etc/php$PHP_VERSION/php-fpm.d/www.conf
 USER servnest:knot
-CMD ["php-fpm83", "--nodaemonize"]
+CMD php-fpm$PHP_VERSION --nodaemonize
diff --git a/upstream.sh b/upstream.sh
index 396002e..3dabb50 100755
--- a/upstream.sh
+++ b/upstream.sh
@@ -14,6 +14,7 @@ sha256sum -c *.sha256
 cat << EOF > .env
 SYS=alpine-minirootfs-$ALPINE_RELEASE.tar.gz
 SFTPGO_VERSION=$SFTPGO_VERSION
+PHP_VERSION=84
 EOF
 
 # to generate checksums