Timezone applied to all containers

docker-compose-dev.yml

@@ -9,6 +9,7 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - TZ=${TIMEZONE}
 
   routerfleet:
     container_name: routerfleet
@@ -24,7 +25,8 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - TIMEZONE=${TIMEZONE}
+      - TZ=${TIMEZONE}
+      - COMPOSE_VERSION=02b
       - COMPOSE_TYPE=with-postgres
 
     volumes:
@@ -41,6 +43,8 @@ services:
     build:
       context: ./containers/cron
       dockerfile: Dockerfile-cron
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -50,6 +54,8 @@ services:
     build:
       context: ./containers/monitoring
       dockerfile: Dockerfile-monitoring
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -62,6 +68,7 @@ services:
       dockerfile: Dockerfile-nginx
     environment:
       - HTTPS_REDIRECT_POLICY=${HTTPS_REDIRECT_POLICY}
+      - TZ=${TIMEZONE}
     volumes:
       - static_volume:/static
       - https_cert:/certificate

docker-compose-no-postgres.yml

@@ -12,7 +12,8 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - TIMEZONE=${TIMEZONE}
+      - TZ=${TIMEZONE}
+      - COMPOSE_VERSION=02b
       - COMPOSE_TYPE=no-postgres
     volumes:
       - sqlite_volume:/var/lib/routerfleet_sqlite/
@@ -24,6 +25,8 @@ services:
     container_name: routerfleet-cron
     restart: unless-stopped
     image: eduardosilva/routerfleet-cron:latest
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -31,6 +34,8 @@ services:
     container_name: routerfleet-monitoring
     restart: unless-stopped
     image: eduardosilva/routerfleet-monitoring:latest
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -40,6 +45,7 @@ services:
     image: eduardosilva/routerfleet-nginx:latest
     environment:
       - HTTPS_REDIRECT_POLICY=${HTTPS_REDIRECT_POLICY}
+      - TZ=${TIMEZONE}
     volumes:
       - static_volume:/static
       - https_cert:/certificate

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - TZ=${TIMEZONE}
 
   routerfleet:
     container_name: routerfleet
@@ -23,7 +24,8 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - TIMEZONE=${TIMEZONE}
+      - TZ=${TIMEZONE}
+      - COMPOSE_VERSION=02b
       - COMPOSE_TYPE=with-postgres
     volumes:
       - sqlite_volume:/var/lib/routerfleet_sqlite/
@@ -37,6 +39,8 @@ services:
     container_name: routerfleet-cron
     restart: unless-stopped
     image: eduardosilva/routerfleet-cron:latest
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -44,6 +48,8 @@ services:
     container_name: routerfleet-monitoring
     restart: unless-stopped
     image: eduardosilva/routerfleet-monitoring:latest
+    environment:
+      - TZ=${TIMEZONE}
     depends_on:
       - routerfleet
 
@@ -53,6 +59,7 @@ services:
     image: eduardosilva/routerfleet-nginx:latest
     environment:
       - HTTPS_REDIRECT_POLICY=${HTTPS_REDIRECT_POLICY}
+      - TZ=${TIMEZONE}
     volumes:
       - static_volume:/static
       - https_cert:/certificate

entrypoint.sh

@@ -3,6 +3,11 @@ PRODUCTION_SETTINGS_FILE="/app/routerfleet/production_settings.py"
 
 set -e
 
+if [[ "$COMPOSE_VERSION" != "02b" ]]; then
+    echo "ERROR: Please upgrade your docker compose file. Exiting."
+    exit 1
+fi
+
 if [ -z "$SERVER_ADDRESS" ]; then
     echo "SERVER_ADDRESS environment variable is not set. Exiting."
     exit 1
@@ -69,8 +74,8 @@ SECRET_KEY = '$(openssl rand -base64 32)'
 $DATABASES_CONFIG
 EOL
 
-if [ -n "$TIMEZONE" ]; then
-    echo "TIME_ZONE = '$TIMEZONE'" >> $PRODUCTION_SETTINGS_FILE
+if [ -n "$TZ" ]; then
+    echo "TIME_ZONE = '$TZ'" >> $PRODUCTION_SETTINGS_FILE
 fi
 
 sed -i "/^    path('admin\/', admin.site.urls),/s/^    /    # /" /app/routerfleet/urls.py

routerfleet/settings.py

@@ -140,6 +140,6 @@ STATICFILES_DIRS = [
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 MEDIA_ROOT = '/var/lib/routerfleet/'
-ROUTERFLEET_VERSION = 7009
+ROUTERFLEET_VERSION = 7011
 
 from routerfleet.production_settings import *