From c6955056056274cf634084fe547cee011e68315f Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Fri, 23 Sep 2016 10:38:34 +0200
Subject: [PATCH] Make timezone configurable through env variable (#853)

---
 Dockerfile         | 2 +-
 docker-cloud.yml   | 1 +
 docker-compose.yml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 513312512..ece144b9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 
 RUN a2enmod rewrite
 RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets
-RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini
+RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
 COPY . /app
diff --git a/docker-cloud.yml b/docker-cloud.yml
index a398eed26..baac1393b 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -11,6 +11,7 @@ web:
     volumes:
         - /app/uploads
     environment:
+        - PHP_TIMEZONE=UTC
         - MYSQL_USERNAME=admin
         - MYSQL_PASSWORD=pointofsale
         - MYSQL_DB_NAME=ospos
diff --git a/docker-compose.yml b/docker-compose.yml
index fb3a74795..ac518a613 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
         volumes:
             - uploads:/app/uploads
         environment:
+            - PHP_TIMEZONE=UTC
             - MYSQL_USERNAME=admin
             - MYSQL_PASSWORD=pointofsale
             - MYSQL_DB_NAME=ospos