From: Pablo Zmdl <redacted>
Date: Thu, 13 Feb 2025 10:55:37 +0000 (+0100)
Subject: Use php.ini-production as recommended by the upstream image authors
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1091caf2653a4caada574b2a5c3a0079557cb355;p=roundcube-roundcubemail-docker.git

Use php.ini-production as recommended by the upstream image authors
---

diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index 5731c2c..310ca84 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -77,6 +77,9 @@ RUN set -ex; \
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
+# Use the default production configuration
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
 # use custom PHP settings
 COPY php.ini /usr/local/etc/php/conf.d/roundcube-defaults.ini
 
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index e31cd18..731bd38 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -84,6 +84,9 @@ RUN set -ex; \
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
+# Use the default production configuration
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
 # use custom PHP settings
 COPY php.ini /usr/local/etc/php/conf.d/roundcube-defaults.ini