From fe65265dffe9ae6fb6253195c1d1f173469d1eed Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 7 Jun 2025 18:04:40 -0500
Subject: [PATCH] Docker: fix time zones

---
 docker/drop/docker-compose.yaml           | 4 ++--
 docker/freshrss/docker-compose.yaml       | 3 +--
 docker/homeautomation/docker-compose.yaml | 4 +---
 docker/jellyfin/docker-compose.yaml       | 4 +---
 docker/mumble/docker-compose.yaml         | 4 +---
 docker/postgres/docker-compose.yaml       | 4 +---
 docker/tftp/docker-compose.yaml           | 2 --
 docker/tvheadend/docker-compose.yaml      | 3 +--
 8 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/docker/drop/docker-compose.yaml b/docker/drop/docker-compose.yaml
index 5407b591..e86bdd6f 100644
--- a/docker/drop/docker-compose.yaml
+++ b/docker/drop/docker-compose.yaml
@@ -5,9 +5,9 @@ services:
     restart: unless-stopped
     networks:
       - proxy
-    environment:
-      - TZ=Europe/Helsinki
       - IPV6_LOCALIZE=4
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
 networks:
   proxy:
     external: true
diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml
index b9b9b71c..af961c5d 100644
--- a/docker/freshrss/docker-compose.yaml
+++ b/docker/freshrss/docker-compose.yaml
@@ -12,10 +12,9 @@ services:
     environment:
       - PUID=1000
       - PGID=985
-      - TZ=Europe/Helsinki
     volumes:
-      - config:/config
       - /etc/localtime:/etc/localtime:ro
+      - config:/config
 networks:
   freshrss:
     external: false
diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml
index ca42998a..adbcb414 100644
--- a/docker/homeautomation/docker-compose.yaml
+++ b/docker/homeautomation/docker-compose.yaml
@@ -9,11 +9,9 @@ services:
     container_name: home-assistant
     image: homeassistant/home-assistant
     restart: unless-stopped
-    environment:
-      - TZ=Europe/Helsinki
     volumes:
-      - hass:/config
       - /etc/localtime:/etc/localtime:ro
+      - hass:/config
     networks:
       - homeautomation
       - postgres
diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml
index d6edc9df..f617f28d 100644
--- a/docker/jellyfin/docker-compose.yaml
+++ b/docker/jellyfin/docker-compose.yaml
@@ -9,8 +9,6 @@ services:
   jellyfin:
     image: jellyfin/jellyfin
     container_name: jellyfin
-    environment:
-      - TZ=Europe/Helsinki
     ports:
       - 8096:8096
     networks:
@@ -18,11 +16,11 @@ services:
       - authentik
     restart: unless-stopped
     volumes:
+      - /etc/localtime:/etc/localtime:ro
       - config:/config
       - cache:/cache
       - media:/media
       - nextcloud_data:/nextcloud_data
-      - /etc/localtime:/etc/localtime:ro
     devices:
       - /dev/dri/renderD128:/dev/dri/renderD128
       - /dev/dri/card1:/dev/dri/card0
diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml
index 6ffebe23..df0fe9c8 100644
--- a/docker/mumble/docker-compose.yaml
+++ b/docker/mumble/docker-compose.yaml
@@ -4,10 +4,8 @@ services:
   mumble:
     container_name: mumble
     image: phlak/mumble
-    environment:
-      - TZ=Europe/Helsinki
     network_mode: host
     volumes:
-      - config:/etc/mumble
       - /etc/localtime:/etc/localtime:ro
+      - config:/etc/mumble
     restart: unless-stopped
diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml
index 7c420e42..f51c542f 100644
--- a/docker/postgres/docker-compose.yaml
+++ b/docker/postgres/docker-compose.yaml
@@ -4,15 +4,13 @@ services:
   postgres:
     container_name: postgres
     image: postgres:16
-    environment:
-      - TZ=Europe/Helsinki
     ports:
       - 127.0.0.1:5432:5432
     networks:
       - postgres
     volumes:
-      - data:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
+      - data:/var/lib/postgresql/data
     restart: unless-stopped
 networks:
   postgres:
diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml
index 47d6d3c0..d266b8c2 100644
--- a/docker/tftp/docker-compose.yaml
+++ b/docker/tftp/docker-compose.yaml
@@ -2,8 +2,6 @@ services:
   tftp:
     container_name: tftp
     image: pghalliday/tftp
-    environment:
-      - TZ=Europe/Helsinki
     restart: unless-stopped
     ports:
       - 69:69/udp
diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml
index 64a2595c..d6ac73d7 100644
--- a/docker/tvheadend/docker-compose.yaml
+++ b/docker/tvheadend/docker-compose.yaml
@@ -6,14 +6,13 @@ services:
     image: linuxserver/tvheadend
     container_name: tvheadend
     environment:
-      - TZ=Europe/Helsinki
       - PUID=1000
       - PGID=985
     volumes:
+      - /etc/localtime:/etc/localtime:ro
       - config:/config
       - picons:/picons
       - /mnt/Storage/Media/PVR:/recordings
-      - /etc/localtime:/etc/localtime:ro
     ports:
       - 9981:9981
       - 9982:9982