X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docker%2Fphp%2FDockerfile;h=1fb1f29826e7c402cecb9274006767dea4dd4558;hb=refs%2Fpull%2F3733%2Fhead;hp=c230bc44554428255a18dad819ae94b53dd66ffb;hpb=125460345fe4bd0ed9be48a9fbc0657019637a01;p=github%2Fwallabag%2Fwallabag.git

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index c230bc44..1fb1f298 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,11 +1,15 @@
 FROM php:fpm
 
+# Default timezone. To change it, use the argument in the docker-compose.yml file
+ARG timezone='Europe/Paris'
+
 RUN apt-get update && apt-get install -y \
-        libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng12-dev libjpeg-dev \
+    && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
     && docker-php-ext-install \
-        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql gd
 
-RUN echo "date.timezone=Europe/Paris" > /usr/local/etc/php/conf.d/date_timezone.ini
+RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
 
 RUN usermod -u 1000 www-data