From a1f0c2058384a72c9526bc0b2c2d552eab426022 Mon Sep 17 00:00:00 2001
From: DjVinnii <vincentkling@msn.com>
Date: Tue, 2 Nov 2021 15:32:27 +0100
Subject: [PATCH] Add tzdata to webmails

---
 webmails/rainloop/Dockerfile  | 2 +-
 webmails/roundcube/Dockerfile | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile
index f1394d64..109546db 100644
--- a/webmails/rainloop/Dockerfile
+++ b/webmails/rainloop/Dockerfile
@@ -6,7 +6,7 @@ ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/
 
 # Shared later between dovecot postfix nginx rspamd rainloop and roundloop
 RUN apk add --no-cache \
-    python3 py3-pip \
+    python3 py3-pip tzdata \
  && pip3 install socrate==0.2.0
 
 #  https://www.rainloop.net/docs/system-requirements/
diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index 1f788918..b8ba512f 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -9,7 +9,7 @@ FROM ${ARCH}php:7.4-apache as build_other
 FROM build_${QEMU}
 #Shared layer between rainloop and roundcube
 RUN apt-get update && apt-get install -y \
-  python3 curl python3-pip git python3-multidict \
+  python3 curl python3-pip git python3-multidict tzdata \
   && rm -rf /var/lib/apt/lists \
   && echo "ServerSignature Off\nServerName roundcube" >> /etc/apache2/apache2.conf \
   && sed -i 's,CustomLog.*combined$,\0 "'"expr=!(%{HTTP_USER_AGENT}=='health'\&\&(-R '127.0.0.1/8' || -R '::1'))"'",' /etc/apache2/sites-available/000-default.conf
@@ -21,12 +21,14 @@ ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1
 
 ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v4.1.2/carddav-v4.1.2.tar.gz
 
+ENV TZ Etc/UTC
+
 RUN apt-get update && apt-get install -y \
       zlib1g-dev libzip4 libzip-dev libpq-dev \
       python3-jinja2 \
       gpg \
  && docker-php-ext-install zip pdo_mysql pdo_pgsql \
- && echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \
+ && echo date.timezone=${TZ} > /usr/local/etc/php/conf.d/timezone.ini \
  && rm -rf /var/www/html/ \
  && cd /var/www \
  && curl -sL ${ROUNDCUBE_URL} | tar xz \