From 907b9cb931e445c3b77320989bbee71e445e22e1 Mon Sep 17 00:00:00 2001
From: Abel Luck <abel@guardianproject.info>
Date: Fri, 2 Jun 2023 10:46:26 +0000
Subject: [PATCH] docker-compose: set TZ across all containers

---
 docker-compose.yml | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 85852d8..f8a0deb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,9 @@
 version: "3.4"
 
+x-global-vars:
+  &common-global-variables
+  TZ: Etc/UTC
+
 x-zammad-vars:
   &common-zammad-variables
   MEMCACHE_SERVERS: "zammad-memcached:11211"
@@ -41,9 +45,10 @@ services:
   zammad-elasticsearch:
     container_name: zammad-elasticsearch
     environment:
-      - discovery.type=single-node
-      - ES_JAVA_OPTS=-Xms750m -Xmx750m
-      - xpack.security.enabled=false
+      discovery.type: single-node
+      ES_JAVA_OPTS: -Xms750m -Xmx750m
+      xpack.security.enabled: false
+      <<: *common-global-variables
     build: ./docker/elasticsearch
     restart: ${RESTART}
     volumes:
@@ -56,7 +61,7 @@ services:
     depends_on:
       - zammad-postgresql
     environment:
-      <<: *common-zammad-variables
+      <<: [*common-zammad-variables, *common-global-variables]
       POSTGRESQL_USER: zammad
       POSTGRESQL_PASS: ${ZAMMAD_DATABASE_PASSWORD}
     build: ./docker/zammad
@@ -69,6 +74,8 @@ services:
     command: memcached -m 256M
     build: ./docker/memcached
     restart: ${RESTART}
+    environment:
+      <<: *common-global-variables
 
   zammad-nginx:
     platform: linux/x86_64
@@ -83,18 +90,19 @@ services:
     build: ./docker/zammad
     restart: ${RESTART}
     environment:
+      <<: *common-global-variables
       NGINX_SERVER_SCHEME: https
       VIRTUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
       VIRTUAL_PORT: 8080
-
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-postgresql:
     container_name: zammad-postgresql
     environment:
-      - POSTGRES_USER=zammad
-      - POSTGRES_PASSWORD=${ZAMMAD_DATABASE_PASSWORD}
+      <<: *common-global-variables
+      POSTGRES_USER: zammad
+      POSTGRES_PASSWORD: ${ZAMMAD_DATABASE_PASSWORD}
     build: ./docker/postgresql
     restart: ${RESTART}
     ports:
@@ -110,7 +118,8 @@ services:
       - zammad-memcached
       - zammad-postgresql
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+       <<: [*common-global-variables, *common-zammad-variables]
     build: ./docker/zammad
     restart: ${RESTART}
     volumes:
@@ -120,6 +129,8 @@ services:
     container_name: zammad-redis
     build: ./docker/redis
     restart: ${RESTART}
+    environment:
+       <<: *common-global-variables
 
   zammad-scheduler:
     platform: linux/x86_64
@@ -129,7 +140,8 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+       <<: [*common-global-variables, *common-zammad-variables]
     build: ./docker/zammad
     restart: ${RESTART}
     volumes:
@@ -143,7 +155,8 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+       <<: [*common-global-variables, *common-zammad-variables]
     build: ./docker/zammad
     restart: ${RESTART}
     volumes:
@@ -206,6 +219,8 @@ services:
     user: ${CURRENT_UID}
     volumes:
       - ../signald:/signald
+    environment:
+       <<: *common-global-variables
 
   # nginx-proxy:
   #   container_name: nginx-proxy
@@ -226,6 +241,7 @@ services:
     ports:
       - "8003:3000"
     environment:
+      <<: *common-global-variables
       ZAMMAD_PROXY_URL: ${ZAMMAD_PROXY_URL}
       ZAMMAD_URL: ${ZAMMAD_URL}
       ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
@@ -249,6 +265,7 @@ services:
     ports:
       - "8004:3000"
     environment:
+      <<: *common-global-variables
       LINK_EMBEDDED: "true"
 
 volumes: