From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Tue, 12 Nov 2019 12:58:13 +0000 (+0100)
Subject: Merge pull request #4163 from aaa2000/docker-increase-php-memory-limit
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8d8d6818fb6b6bc2f4140285a2a53c74e38bc010;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #4163 from aaa2000/docker-increase-php-memory-limit

Increase php memory limit PHP Docker
---

8d8d6818fb6b6bc2f4140285a2a53c74e38bc010
diff --combined docker/php/Dockerfile
index c43e07fd,43e3cc5f..171e12fc
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@@ -2,6 -2,7 +2,7 @@@ FROM php:7.2-fp
  
  # Default timezone. To change it, use the argument in the docker-compose.yml file
  ARG timezone='Europe/Paris'
+ ARG memorylimit='512M'
  
  RUN apt-get update && apt-get install -y \
          libmcrypt-dev \
@@@ -13,25 -14,21 +14,26 @@@
          libsqlite3-dev \
          imagemagick \
          libmagickwand-dev \
 -        libtidy-dev
 +        libtidy-dev \
 +        git
  RUN docker-php-ext-install \
          iconv \
          mbstring \
 +        gd \
          intl \
          pdo \
          pdo_mysql \
          pdo_pgsql \
          pdo_sqlite \
 -        tidy
 +        sockets \
 +        tidy \
 +        bcmath \
 +        zip
  
  RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick
  
  RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
+ RUN echo "memory_limit ="$memorylimit > /usr/local/etc/php/conf.d/memory_limit.ini
  
  RUN usermod -u 1000 www-data