pull up to 2.35.1

This commit is contained in:
Matthew Slowe 2024-02-27 14:23:40 +00:00
parent cb0775ac8b
commit 3ddc793222
4 changed files with 6 additions and 5 deletions

View File

@ -3,7 +3,7 @@ FROM alpine:latest
LABEL description "Snappymail is a simple, modern & fast web-based client based on Rainloop" 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 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 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-ldap \
php-mbstring \ php-mbstring \
php-ctype \ php-ctype \
php-fileinfo \
php-simplexml php-simplexml
WORKDIR /tmp WORKDIR /tmp
RUN set -ex ; \ RUN set -ex ; \

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec php-fpm81 exec php-fpm82

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Set attachment size limit # Set attachment size limit
sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php81/php-fpm.conf /etc/nginx/nginx.conf 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/php81/php-fpm.conf sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php82/php-fpm.conf
# Remove postfixadmin-change-password plugin if exist # Remove postfixadmin-change-password plugin if exist
if [ -d "/rainloop/data/_data_/_default_/plugins/postfixadmin-change-password" ]; then 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" echo "[INFO] Logging to stdout activated"
chmod o+w /dev/stdout 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 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 fi
# Add postfixadmin-change-password plugin # Add postfixadmin-change-password plugin