2 files changed, 35 insertions, 11 deletions

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index d0266ec7..171e12fc 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,15 +1,39 @@
-FROM php:fpm
+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
 
diff --git a/docker/postgres/env b/docker/postgres/env
index 80c78c2a..0dd1adb3 100644
--- a/docker/postgres/env
+++ b/docker/postgres/env
@@ -1,9 +1,9 @@
 POSTGRES_USER=wallabag
 POSTGRES_PASSWORD=wallapass
 POSTGRES_DB=wallabag
-export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
-export SYMFONY__ENV__DATABASE_HOST=rdbms
-export SYMFONY__ENV__DATABASE_PORT=5432
-export SYMFONY__ENV__DATABASE_NAME=wallabag
-export SYMFONY__ENV__DATABASE_USER=wallabag
-export SYMFONY__ENV__DATABASE_PASSWORD=wallapass
+SYMFONY__ENV__DATABASE_HOST=rdbms
+SYMFONY__ENV__DATABASE_PORT=5432
+SYMFONY__ENV__DATABASE_NAME=wallabag
+SYMFONY__ENV__DATABASE_USER=wallabag
+SYMFONY__ENV__DATABASE_PASSWORD=wallapass
+SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql