From 52b959db23500d87cb8a54d27518905a1783fbaf Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 9 Feb 2022 02:51:45 +0100 Subject: [PATCH] Revert "Fix memory_limit & upload_limit ENV setup" This reverts commit c277360de4dd812801a297e07cccd94e86dc9a04. --- 2021.09/apache/Dockerfile | 6 +++--- 2021.09/fpm-alpine/Dockerfile | 6 +++--- 2021.09/fpm/Dockerfile | 6 +++--- 2022.02/apache/Dockerfile | 6 +++--- 2022.02/fpm-alpine/Dockerfile | 6 +++--- 2022.02/fpm/Dockerfile | 6 +++--- 2022.05-dev/apache/Dockerfile | 6 +++--- 2022.05-dev/fpm-alpine/Dockerfile | 6 +++--- 2022.05-dev/fpm/Dockerfile | 6 +++--- Dockerfile-alpine.template | 6 +++--- Dockerfile-debian.template | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index 2191133..d10b6b3 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 6d5668a..df75eaa 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -120,9 +120,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index a687f81..0421b17 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.02/apache/Dockerfile b/2022.02/apache/Dockerfile index 73f2ed2..60a0b8e 100644 --- a/2022.02/apache/Dockerfile +++ b/2022.02/apache/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.02/fpm-alpine/Dockerfile b/2022.02/fpm-alpine/Dockerfile index f0e1038..3862c63 100644 --- a/2022.02/fpm-alpine/Dockerfile +++ b/2022.02/fpm-alpine/Dockerfile @@ -120,9 +120,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.02/fpm/Dockerfile b/2022.02/fpm/Dockerfile index de49d15..bb581e5 100644 --- a/2022.02/fpm/Dockerfile +++ b/2022.02/fpm/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.05-dev/apache/Dockerfile b/2022.05-dev/apache/Dockerfile index 6bc2e83..db618f1 100644 --- a/2022.05-dev/apache/Dockerfile +++ b/2022.05-dev/apache/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.05-dev/fpm-alpine/Dockerfile b/2022.05-dev/fpm-alpine/Dockerfile index 2969104..2a9d914 100644 --- a/2022.05-dev/fpm-alpine/Dockerfile +++ b/2022.05-dev/fpm-alpine/Dockerfile @@ -120,9 +120,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/2022.05-dev/fpm/Dockerfile b/2022.05-dev/fpm/Dockerfile index 2550d35..8a6917e 100644 --- a/2022.05-dev/fpm/Dockerfile +++ b/2022.05-dev/fpm/Dockerfile @@ -139,9 +139,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 56617b9..f7fbc2d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -119,9 +119,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index c68cd37..8e32e3b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -138,9 +138,9 @@ RUN set -ex; \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ { \ - echo "memory_limit=${PHP_MEMORY_LIMIT}"; \ - echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \ - echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \ + echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ + echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ + echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ \ mkdir /var/www/data; \