Merge remote-tracking branch 'github/master'

L0rD59 · Jul 16, 2015 · a57db01 · a57db01
2 parents 5976fbf + 5e5acab
commit a57db01
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile
@@ -23,6 +23,7 @@ RUN tar -xf /usr/src/php/ext/amqp.tgz -C /usr/src/php/ext/ && \
 # Configurations
 RUN ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime
 
+RUN echo "date.timezone = \"Europe/Paris\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 # Set working directory.
 WORKDIR /app