Merge pull request #1771 from wallabag/docker-timezone

Docker timezone

docker-compose.yml

@@ -1,4 +1,6 @@
-nginx:
+version: '2'
+services:
+    nginx:
         image: nginx
         ports:
             - "8080:80"
@@ -9,8 +11,12 @@ nginx:
         links:
             - php:php
         command: nginx -c /nginx.conf
-php:
+    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:
@@ -24,19 +30,19 @@ php:
             # If all DBMS are commented out, sqlite will be used as default
             # - ./docker/postgres/env
             # - ./docker/mariadb/env
-#postgres:
+    #postgres:
-#    image: postgres:9
+    #    image: postgres:9
-#    ports:
+    #    ports:
-#        - "5432:5432"
+    #        - "5432:5432"
-#    volumes:
+    #    volumes:
-#        - ./docker/data/pgsql:/var/lib/postgresql/data
+    #        - ./docker/data/pgsql:/var/lib/postgresql/data
-#    env_file:
+    #    env_file:
-#        - ./docker/postgres/env
+    #        - ./docker/postgres/env
-#mariadb:
+    #mariadb:
-#    image: mariadb:10
+    #    image: mariadb:10
-#    ports:
+    #    ports:
-#        - "3306:3306"
+    #        - "3306:3306"
-#    volumes:
+    #    volumes:
-#        - ./docker/data/mariadb:/var/lib/mysql
+    #        - ./docker/data/mariadb:/var/lib/mysql
-#    env_file:
+    #    env_file:
-#        - ./docker/mariadb/env
+    #        - ./docker/mariadb/env

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"]