From 162da8e810f2136439c8688eca16924f143386cd Mon Sep 17 00:00:00 2001
From: Matthew Slowe <foo@mafoo.org.uk>
Date: Wed, 12 Jun 2024 07:32:16 +0100
Subject: [PATCH] changes for alpine 3.20 and php83

---
 Dockerfile                               | 2 +-
 rootfs/etc/{php82 => php83}/php-fpm.conf | 0
 rootfs/services/php/run                  | 2 +-
 rootfs/usr/local/bin/run.sh              | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename rootfs/etc/{php82 => php83}/php-fpm.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index c81108f..a48bff9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:latest
 LABEL description "Snappymail is a simple, modern & fast web-based client based on Rainloop"
 
 ARG GPG_FINGERPRINT="1016 E470 7914 5542 F8BA  1335 4820 8BA1 3290 F3EB"
-ARG RAINLOOP_VERSION=2.35.3
+ARG RAINLOOP_VERSION=2.36.3
 
 ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDOUT=false MEMORY_LIMIT=128M
 
diff --git a/rootfs/etc/php82/php-fpm.conf b/rootfs/etc/php83/php-fpm.conf
similarity index 100%
rename from rootfs/etc/php82/php-fpm.conf
rename to rootfs/etc/php83/php-fpm.conf
diff --git a/rootfs/services/php/run b/rootfs/services/php/run
index f924a9d..364dc4b 100644
--- a/rootfs/services/php/run
+++ b/rootfs/services/php/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm82
+exec php-fpm83 --nodaemonize
diff --git a/rootfs/usr/local/bin/run.sh b/rootfs/usr/local/bin/run.sh
index 53ce221..4e7f562 100644
--- a/rootfs/usr/local/bin/run.sh
+++ b/rootfs/usr/local/bin/run.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Set attachment size limit
-sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php82/php-fpm.conf /etc/nginx/nginx.conf
-sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php82/php-fpm.conf
+sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php83/php-fpm.conf /etc/nginx/nginx.conf
+sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php83/php-fpm.conf
 
 # Remove postfixadmin-change-password plugin if exist
 if [ -d "/rainloop/data/_data_/_default_/plugins/postfixadmin-change-password" ]; then
@@ -14,7 +14,7 @@ if [ "$LOG_TO_STDOUT" = true ]; then
   echo "[INFO] Logging to stdout activated"
   chmod o+w /dev/stdout
   sed -i "s/.*error_log.*$/error_log \/dev\/stdout warn;/" /etc/nginx/nginx.conf
-  sed -i "s/.*error_log.*$/error_log = \/dev\/stdout/" /etc/php82/php-fpm.conf
+  sed -i "s/.*error_log.*$/error_log = \/dev\/stdout/" /etc/php83/php-fpm.conf
 fi
 
 # Add postfixadmin-change-password plugin