From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Thu, 14 Nov 2019 14:19:18 +0000 (+0100)
Subject: Merge pull request #4183 from wallabag/update-deps
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=98d8e0c1b929a198da0fbcbffbc011e985b5df01;hp=4a31f3b6a22b29bee5295aa3099fff79d137a00c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #4183 from wallabag/update-deps

Update deps
---

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index ffdf33c9..171e12fc 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -2,6 +2,7 @@ FROM php:7.2-fpm
 
 # 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,20 +14,26 @@ RUN apt-get update && apt-get install -y \
         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