From 447b53e733bfbca2f52b52b355b6f791e5d58747 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 2 Mar 2024 20:32:45 +0100 Subject: [PATCH] Use production ready php.ini per default --- 2023.12/apache/Dockerfile | 1 + 2023.12/fpm-alpine/Dockerfile | 1 + 2023.12/fpm/Dockerfile | 1 + 2024.03-dev/apache/Dockerfile | 1 + 2024.03-dev/fpm-alpine/Dockerfile | 1 + 2024.03-dev/fpm/Dockerfile | 1 + 2024.03-rc/apache/Dockerfile | 1 + 2024.03-rc/fpm-alpine/Dockerfile | 1 + 2024.03-rc/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 11 files changed, 11 insertions(+) diff --git a/2023.12/apache/Dockerfile b/2023.12/apache/Dockerfile index 03d50ff..05c1364 100644 --- a/2023.12/apache/Dockerfile +++ b/2023.12/apache/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2023.12/fpm-alpine/Dockerfile b/2023.12/fpm-alpine/Dockerfile index 1fa0f26..a463f3b 100644 --- a/2023.12/fpm-alpine/Dockerfile +++ b/2023.12/fpm-alpine/Dockerfile @@ -128,6 +128,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2023.12/fpm/Dockerfile b/2023.12/fpm/Dockerfile index 055a799..7fbf1ae 100644 --- a/2023.12/fpm/Dockerfile +++ b/2023.12/fpm/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-dev/apache/Dockerfile b/2024.03-dev/apache/Dockerfile index c032631..1d4127e 100644 --- a/2024.03-dev/apache/Dockerfile +++ b/2024.03-dev/apache/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-dev/fpm-alpine/Dockerfile b/2024.03-dev/fpm-alpine/Dockerfile index 7550add..1e7ad09 100644 --- a/2024.03-dev/fpm-alpine/Dockerfile +++ b/2024.03-dev/fpm-alpine/Dockerfile @@ -128,6 +128,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-dev/fpm/Dockerfile b/2024.03-dev/fpm/Dockerfile index a24e7c9..b2c3a2b 100644 --- a/2024.03-dev/fpm/Dockerfile +++ b/2024.03-dev/fpm/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-rc/apache/Dockerfile b/2024.03-rc/apache/Dockerfile index aafb7bf..a71cf54 100644 --- a/2024.03-rc/apache/Dockerfile +++ b/2024.03-rc/apache/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-rc/fpm-alpine/Dockerfile b/2024.03-rc/fpm-alpine/Dockerfile index 45f3438..ff69a7b 100644 --- a/2024.03-rc/fpm-alpine/Dockerfile +++ b/2024.03-rc/fpm-alpine/Dockerfile @@ -128,6 +128,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/2024.03-rc/fpm/Dockerfile b/2024.03-rc/fpm/Dockerfile index fd47a1c..8155d6c 100644 --- a/2024.03-rc/fpm/Dockerfile +++ b/2024.03-rc/fpm/Dockerfile @@ -147,6 +147,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index df68c89..3d345dc 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -127,6 +127,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 0379e94..86b4b9d 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -146,6 +146,7 @@ RUN set -ex; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ + ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \