Timezone: step1

tchapi · Sep 10, 2023 · e2782db · e2782db
1 parent 7de7098
commit e2782db
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/docker/.env b/docker/.env
@@ -1,6 +1,8 @@
 # For the MariaDB container mainly
 DB_ROOT_PASSWORD=notSoSecure
 
+TIMEZONE="Europe/Paris"
+
 # The Davis database, user and password
 DB_DATABASE=davis
 DB_USER=davis_user

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -59,9 +59,6 @@ RUN apk --update --virtual build-deps-imap add --no-cache imap-dev openssl-dev k
     && apk del build-deps-imap \
     && rm -rf /tmp/*
 
-# Set timezone correctly
-RUN echo 'date.timezone = "Europe/Paris"' > /usr/local/etc/php/conf.d/timezone.ini
-
 # Davis installation
 ADD . /var/www/davis
 WORKDIR /var/www/davis

diff --git a/docker/docker-compose-postgresql.yml b/docker/docker-compose-postgresql.yml
@@ -50,6 +50,7 @@ services:
       - WEBDAV_TMP_DIR=${WEBDAV_TMP_DIR}
       - WEBDAV_PUBLIC_DIR=${WEBDAV_PUBLIC_DIR}
       - INVITE_FROM_ADDRESS=${INVITE_FROM_ADDRESS}
+      - APP_TIMEZONE=${TIMEZONE}
     depends_on:
       - postgresql
     volumes:

diff --git a/docker/docker-compose-sqlite.yml b/docker/docker-compose-sqlite.yml
@@ -40,6 +40,7 @@ services:
       - WEBDAV_TMP_DIR=${WEBDAV_TMP_DIR}
       - WEBDAV_PUBLIC_DIR=${WEBDAV_PUBLIC_DIR}
       - INVITE_FROM_ADDRESS=${INVITE_FROM_ADDRESS}
+      - APP_TIMEZONE=${TIMEZONE}
     volumes:
       - davis_www:/var/www/davis
       - davis_data:/data

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -51,6 +51,7 @@ services:
       - WEBDAV_TMP_DIR=${WEBDAV_TMP_DIR}
       - WEBDAV_PUBLIC_DIR=${WEBDAV_PUBLIC_DIR}
       - INVITE_FROM_ADDRESS=${INVITE_FROM_ADDRESS}
+      - APP_TIMEZONE=${TIMEZONE}
     depends_on:
       - mysql
     volumes: