aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordjay <trash@goovy.com>2016-03-03 19:21:37 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-03-09 09:04:31 +0100
commitb80841f23c6736aef7485aa3d8ba7cf0af861f64 (patch)
tree75fc21b808d344e6f1aeb8f3e7a192f6c6c3f7f3
parent612f5f1ec7eeaeacb1f1bc0f2e15fbe5ff7d7044 (diff)
downloadwallabag-b80841f23c6736aef7485aa3d8ba7cf0af861f64.tar.gz
wallabag-b80841f23c6736aef7485aa3d8ba7cf0af861f64.tar.zst
wallabag-b80841f23c6736aef7485aa3d8ba7cf0af861f64.zip
Add comment about timezone definition
-rw-r--r--docker-compose.yml1
-rw-r--r--docker/php/Dockerfile1
2 files changed, 2 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 26fba8f0..50d8c546 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,7 @@ services:
15 build: 15 build:
16 context: docker/php 16 context: docker/php
17 args: 17 args:
18 # Set here your timezone using one of this: http://php.net/manual/en/timezones.php
18 timezone: 'Europe/Monaco' 19 timezone: 'Europe/Monaco'
19 ports: 20 ports:
20 - "9000:9000" 21 - "9000:9000"
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index b43d40b5..29d27c3a 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,5 +1,6 @@
1FROM php:fpm 1FROM php:fpm
2 2
3# Default timezone. To change it, use the argument in the docker-compose.yml file
3ARG timezone='Europe/Paris' 4ARG timezone='Europe/Paris'
4 5
5RUN apt-get update && apt-get install -y \ 6RUN apt-get update && apt-get install -y \