diff --git a/Dockerfile b/Dockerfile index 762f5e4..8e77384 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.29.3 +ARG RAINLOOP_VERSION=2.35.1 ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDOUT=false MEMORY_LIMIT=128M @@ -32,6 +32,7 @@ RUN apk -U upgrade \ php-ldap \ php-mbstring \ php-ctype \ + php-fileinfo \ php-simplexml WORKDIR /tmp RUN set -ex ; \ diff --git a/rootfs/etc/php81/php-fpm.conf b/rootfs/etc/php82/php-fpm.conf similarity index 100% rename from rootfs/etc/php81/php-fpm.conf rename to rootfs/etc/php82/php-fpm.conf diff --git a/rootfs/services/php/run b/rootfs/services/php/run index a4d0073..f924a9d 100644 --- a/rootfs/services/php/run +++ b/rootfs/services/php/run @@ -1,2 +1,2 @@ #!/bin/sh -exec php-fpm81 +exec php-fpm82 diff --git a/rootfs/usr/local/bin/run.sh b/rootfs/usr/local/bin/run.sh index 6621965..53ce221 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/g" /etc/php81/php-fpm.conf /etc/nginx/nginx.conf -sed -i "s//$MEMORY_LIMIT/g" /etc/php81/php-fpm.conf +sed -i "s//$UPLOAD_MAX_SIZE/g" /etc/php82/php-fpm.conf /etc/nginx/nginx.conf +sed -i "s//$MEMORY_LIMIT/g" /etc/php82/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/php81/php-fpm.conf + sed -i "s/.*error_log.*$/error_log = \/dev\/stdout/" /etc/php82/php-fpm.conf fi # Add postfixadmin-change-password plugin