From f5d27c615330fc4331522405fd19234e02385770 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 12 Sep 2018 16:43:08 +0200 Subject: [PATCH] Add custom memory limit for PHP CLI (fix #447) --- 12.0/apache/Dockerfile | 2 ++ 12.0/fpm-alpine/Dockerfile | 2 ++ 12.0/fpm/Dockerfile | 2 ++ 13.0/apache/Dockerfile | 2 ++ 13.0/fpm-alpine/Dockerfile | 2 ++ 13.0/fpm/Dockerfile | 2 ++ 14.0/apache/Dockerfile | 2 ++ 14.0/fpm-alpine/Dockerfile | 2 ++ 14.0/fpm/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ Dockerfile-debian.template | 2 ++ 11 files changed, 22 insertions(+) diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 8519c73a..338de7a1 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index daf1f5ff..3d2be28c 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -78,6 +78,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 3e6f44ba..e53bf612 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index d92cbf12..3ee56d07 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 0298095e..6ce9aa42 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -78,6 +78,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 063945d8..a3feaf2f 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index 328af1f9..c2cdce82 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 5083e077..aeb9db69 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -78,6 +78,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index 132efb11..7ee23129 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -89,6 +89,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 266c8076..db405303 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -77,6 +77,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 6d3da1d2..ab6f88f9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -88,6 +88,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ + \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www