From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Wed, 9 Mar 2016 09:42:15 +0000 (+0100)
Subject: Merge pull request #1771 from wallabag/docker-timezone
X-Git-Tag: 2.0.0-beta.2~6
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e7931dbdf8c045ddc7d1085de0fe084ae001170d;hp=d460a7377ab3672cf05ec18301f94c9d66fc5cff;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1771 from wallabag/docker-timezone

Docker timezone
---

diff --git a/docker-compose.yml b/docker-compose.yml
index c774b621..50d8c546 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,42 +1,48 @@
-nginx:
-    image: nginx
-    ports:
-        - "8080:80"
-    volumes:
-        - ./docker/nginx/nginx.conf:/nginx.conf
-        - ./docker/logs/nginx:/var/log/nginx
-        - .:/var/www/html
-    links:
-        - php:php
-    command: nginx -c /nginx.conf
-php:
-    build: docker/php
-    ports:
-        - "9000:9000"
-    volumes:
-        - .:/var/www/html
-    #links:
-        # - "postgres:rdbms"
-        # - "mariadb:rdbms"
-    env_file:
-        - ./docker/php/env
-        # Comment non-used DBMS lines
-        # If all DBMS are commented out, sqlite will be used as default
-        # - ./docker/postgres/env
-        # - ./docker/mariadb/env
-#postgres:
-#    image: postgres:9
-#    ports:
-#        - "5432:5432"
-#    volumes:
-#        - ./docker/data/pgsql:/var/lib/postgresql/data
-#    env_file:
-#        - ./docker/postgres/env
-#mariadb:
-#    image: mariadb:10
-#    ports:
-#        - "3306:3306"
-#    volumes:
-#        - ./docker/data/mariadb:/var/lib/mysql
-#    env_file:
-#        - ./docker/mariadb/env
+version: '2'
+services:
+    nginx:
+        image: nginx
+        ports:
+            - "8080:80"
+        volumes:
+            - ./docker/nginx/nginx.conf:/nginx.conf
+            - ./docker/logs/nginx:/var/log/nginx
+            - .:/var/www/html
+        links:
+            - php:php
+        command: nginx -c /nginx.conf
+    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:
+            - .:/var/www/html
+        #links:
+            # - "postgres:rdbms"
+            # - "mariadb:rdbms"
+        env_file:
+            - ./docker/php/env
+            # Comment non-used DBMS lines
+            # If all DBMS are commented out, sqlite will be used as default
+            # - ./docker/postgres/env
+            # - ./docker/mariadb/env
+    #postgres:
+    #    image: postgres:9
+    #    ports:
+    #        - "5432:5432"
+    #    volumes:
+    #        - ./docker/data/pgsql:/var/lib/postgresql/data
+    #    env_file:
+    #        - ./docker/postgres/env
+    #mariadb:
+    #    image: mariadb:10
+    #    ports:
+    #        - "3306:3306"
+    #    volumes:
+    #        - ./docker/data/mariadb:/var/lib/mysql
+    #    env_file:
+    #        - ./docker/mariadb/env
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 7c56ae57..29d27c3a 100644
--- a/docker/php/Dockerfile
+++ b/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"]