Merge pull request #1771 from wallabag/docker-timezone

Docker timezone

docker-compose.yml

@@ -1,3 +1,5 @@
+version: '2'
+services:
     nginx:
         image: nginx
         ports:
@@ -10,7 +12,11 @@ nginx:
             - php:php
         command: nginx -c /nginx.conf
     php:
-    build: docker/php
+        build:
+            context: docker/php
+            args:
+                # Set here your timezone using one of this: http://php.net/manual/en/timezones.php
+                timezone: 'Europe/Monaco'
         ports:
             - "9000:9000"
         volumes:

docker/php/Dockerfile

@@ -1,10 +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 \
     && docker-php-ext-install \
         iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
 
+RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
+
 RUN usermod -u 1000 www-data
 
 CMD ["php-fpm"]