From 96dd0e75f20a1f1f8203f3438ae7a82d260a0ef8 Mon Sep 17 00:00:00 2001
From: Charles Chin <eallions@gmail.com>
Date: Tue, 1 Aug 2023 18:09:46 +0800
Subject: [PATCH] [feature] Configurable timezone in containers (#2046)

---
 Dockerfile                                 | 2 ++
 example/docker-compose/docker-compose.yaml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c7bcdfcb6..6b0c3b4cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,8 @@ RUN yarn install --cwd web/source && \
 
 # stage 3: build the executor container
 FROM --platform=${TARGETPLATFORM} alpine:3.17.2 as executor
+RUN apk add --no-cache tzdata
+ENV TZ="UTC"
 
 # switch to non-root user:group for GtS
 USER 1000:1000
diff --git a/example/docker-compose/docker-compose.yaml b/example/docker-compose/docker-compose.yaml
index 429088934..87f2cb8d4 100644
--- a/example/docker-compose/docker-compose.yaml
+++ b/example/docker-compose/docker-compose.yaml
@@ -13,6 +13,7 @@ services:
       GTS_DB_ADDRESS: /gotosocial/storage/sqlite.db
       GTS_LETSENCRYPT_ENABLED: "false"
       GTS_LETSENCRYPT_EMAIL_ADDRESS: ""
+      #TZ: "UTC"
       ## For reverse proxy setups:
       # GTS_TRUSTED_PROXIES: "172.x.x.x"
     ports:
@@ -23,6 +24,8 @@ services:
       #- "127.0.0.1:8080:8080"
     volumes:
       - ~/gotosocial/data:/gotosocial/storage
+      #- /etc/localtime:/etc/localtime:ro
+      #- /etc/timezone:/etc/timezone:ro
     restart: "always"
 
 networks: