From 053aaa056c42df78925e21d55c232a6e1d41a9fc Mon Sep 17 00:00:00 2001
From: Aaron Spettl <aaron@spettl.de>
Date: Thu, 7 Jun 2018 12:11:24 +0200
Subject: [PATCH 1/2] Add php.ini with recommended PHP configuration

---
 php-apache/php.ini | 10 ++++++++++
 php-fpm/php.ini    | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 php-apache/php.ini
 create mode 100644 php-fpm/php.ini

diff --git a/php-apache/php.ini b/php-apache/php.ini
new file mode 100644
index 0000000..7b2147d
--- /dev/null
+++ b/php-apache/php.ini
@@ -0,0 +1,10 @@
+memory_limit=64M
+display_errors=Off
+log_errors=On
+upload_max_filesize=5M
+post_max_size=6M
+zlib.output_compression=Off
+session.auto_start=Off
+session.gc_maxlifetime=21600
+session.gc_divisor=500
+session.gc_probability=1
diff --git a/php-fpm/php.ini b/php-fpm/php.ini
new file mode 100644
index 0000000..7b2147d
--- /dev/null
+++ b/php-fpm/php.ini
@@ -0,0 +1,10 @@
+memory_limit=64M
+display_errors=Off
+log_errors=On
+upload_max_filesize=5M
+post_max_size=6M
+zlib.output_compression=Off
+session.auto_start=Off
+session.gc_maxlifetime=21600
+session.gc_divisor=500
+session.gc_probability=1

From 21460c4ed3eb304f5b62292fe8178372e1f13afe Mon Sep 17 00:00:00 2001
From: Aaron Spettl <aaron@spettl.de>
Date: Sat, 23 Jun 2018 11:52:28 +0200
Subject: [PATCH 2/2] Use php.ini for PHP default settings, override for max
 upload file size

---
 php-apache/Dockerfile           | 3 +++
 php-apache/docker-entrypoint.sh | 4 ++--
 php-fpm/Dockerfile              | 3 +++
 php-fpm/docker-entrypoint.sh    | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 0bc8cd5..621c8b0 100644
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -48,6 +48,9 @@ RUN set -ex; \
 # enable mod_rewrite
 RUN a2enmod rewrite
 
+# use custom PHP settings
+COPY php.ini /usr/local/etc/php/conf.d/roundcube-defaults.ini
+
 # expose these volumes
 VOLUME /var/roundcube/config
 VOLUME /tmp/roundcube-temp
diff --git a/php-apache/docker-entrypoint.sh b/php-apache/docker-entrypoint.sh
index 294bb44..3b7db5c 100755
--- a/php-apache/docker-entrypoint.sh
+++ b/php-apache/docker-entrypoint.sh
@@ -11,7 +11,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
       ( set -x; ls -A; sleep 10 )
     fi
     tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
-    sed -i 's/mod_php5.c/mod_php7.c/' .htaccess
     echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $PWD"
   fi
 
@@ -86,7 +85,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   fi
 
   if [ ! -z "${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" ]; then
-    sed -i -E "s/(upload_max_filesize|post_max_size) +[0-9BKMG]+/\1 ${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}/g" $PWD/.htaccess
+    echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
+    echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
   fi
 fi
 
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index c25be08..85a77d2 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -45,6 +45,9 @@ RUN set -ex; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	rm -rf /var/lib/apt/lists/*
 
+# use custom PHP settings
+COPY php.ini /usr/local/etc/php/conf.d/roundcube-defaults.ini
+
 # expose these volumes
 VOLUME /var/roundcube/config
 VOLUME /var/www/html
diff --git a/php-fpm/docker-entrypoint.sh b/php-fpm/docker-entrypoint.sh
index 2ec3766..c253fc8 100755
--- a/php-fpm/docker-entrypoint.sh
+++ b/php-fpm/docker-entrypoint.sh
@@ -11,7 +11,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
       ( set -x; ls -A; sleep 10 )
     fi
     tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
-    sed -i 's/mod_php5.c/mod_php7.c/' .htaccess
     echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $PWD"
   fi
 
@@ -86,7 +85,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   fi
 
   if [ ! -z "${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" ]; then
-    sed -i -E "s/(upload_max_filesize|post_max_size) +[0-9BKMG]+/\1 ${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}/g" $PWD/.htaccess
+    echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
+    echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
   fi
 fi