Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-bundle...

[github/wallabag/wallabag.git] / docker / php / Dockerfile

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index b632cb8a2177fc6806428cb31c7e0e130d65367d..171e12fc979e0d4ee3777e54a653cfc5bfb12418 100644 (file)
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -2,14 +2,38 @@ 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 libicu-dev libpq-dev libxml2-dev libpng-dev libjpeg-dev \
-    && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
-    && docker-php-ext-install \
-        iconv mbstring intl pdo pdo_mysql pdo_pgsql gd
+        libmcrypt-dev \
+        libicu-dev \
+        libpq-dev \
+        libxml2-dev \
+        libpng-dev \
+        libjpeg-dev \
+        libsqlite3-dev \
+        imagemagick \
+        libmagickwand-dev \
+        libtidy-dev \
+        git
+RUN docker-php-ext-install \
+        iconv \
+        mbstring \
+        gd \
+        intl \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pdo_sqlite \
+        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