Fix Timezone Handling for Containers (#375)

* Add timezone setting to template.env

Add timezone setting option to template.env

* Add timezone environment variable to services

- Add timezone environment variable to all services
- Setting Default to "UTC"

* Add PHP timezone config to docker-compose

- Add timezone configuration for PHP in docker-compose file.
- Replace PHP timezone in misp-core with the new config-file tzone.ini

Perhaps there are better solutions for changing the time zone from PHP during runtime.

* Change PHP timezone variable and set localtime

Updated PHP timezone configuration 
and added symlink for timezone for supervisord.

* Fix timezone setting in PHP configuration

sed dosen´t use "?"  so PHP_TIMEZONE was setting in php.ini

* Change PHP_TIMEZONE variable to use TZ

PHP_TIMEZONE wasn`t in template.env and so most not in use.
TZ Variable the global Timezone variable in this Project

* Remove tzone.ini configuration from docker-compose

Removed timezone configuration from docker-compose.
With the "sed fix" in the entrypoint_fpm.sh, No need to mount a separate file now

* Change timezone setting to use update-alternatives

Updated timezone setting method for supervisord compatibility with debian standard methode

* sed TZ:UTC to TZ:-UTC

add `-` so default (UTC) is in use, if TZ is not in use

* Change php-timezone variable to use TZ directly

* Remove PHP_TIMEZONE environment variable

PHP_timezone isn`t in use
TZ exist

* Update PHP timezone configuration to TZ in entrypoint_fpm.sh

* Update timezone comment in template.env

CET or CEST not useable timezone in /usr/share/zoneinfo/

* Update timezone setting in entrypoint.sh

Remove default value for TZ when setting timezone.

Author: LSI-ZuagrastaWastl

core/files/entrypoint.sh

@@ -89,7 +89,8 @@ export PHP_SESSION_CHECK_AGENT=${PHP_SESSION_CHECK_AGENT:-false}
 export PHP_SESSION_COOKIE_SECURE=${PHP_SESSION_COOKIE_SECURE:-true}
 export PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN}
 export PHP_SESSION_COOKIE_SAMESITE=${PHP_SESSION_COOKIE_SAMESITE:-Lax}
-export PHP_TIMEZONE=${PHP_TIMEZONE:-UTC}
+
+export TZ=${TZ:-UTC}
 
 export NGINX_X_FORWARDED_FOR=${NGINX_X_FORWARDED_FOR:-false}
 export NGINX_SET_REAL_IP_FROM=${NGINX_SET_REAL_IP_FROM}
@@ -102,6 +103,11 @@ export SUPERVISOR_HOST=${SUPERVISOR_HOST:-127.0.0.1}
 export SUPERVISOR_USERNAME=${SUPERVISOR_USERNAME:-supervisor}
 export SUPERVISOR_PASSWORD=${SUPERVISOR_PASSWORD:-supervisor}
 
+# Setting Timezone for supervisord
+update-alternatives --install /etc/localtime localtime /usr/share/zoneinfo/${TZ} 0
+# Also set /etc/timezone for broader compatibility
+echo "${TZ}" > /etc/timezone
+
 # Hinders further execution when sourced from other scripts
 if [[ "${BASH_SOURCE[0]}" != "$0" ]]; then
     return

core/files/entrypoint_fpm.sh

@@ -46,8 +46,8 @@ change_php_vars() {
         fi
         sed -i "s/session.sid_length = .*/session.sid_length = 64/" "$FILE"
         sed -i "s/session.use_strict_mode = .*/session.use_strict_mode = 1/" "$FILE"
-        echo "Configure PHP | Setting 'date.timezone = ${PHP_TIMEZONE}'"
-        sed -i "s/;?date.timezone = .*/date.timezone = ${PHP_TIMEZONE}/" "$FILE"
+        echo "Configure PHP | Setting 'date.timezone = ${TZ}'"
+        sed -i "s/;date.timezone = .*/date.timezone = ${TZ}/" "$FILE"
     done
 
     for FILE in /etc/php/*/fpm/pool.d/www.conf

docker-compose.yml

@@ -16,6 +16,7 @@ services:
       - "SMARTHOST_USER=${SMARTHOST_USER}"
       - "SMARTHOST_PASSWORD=${SMARTHOST_PASSWORD}"
       - "SMARTHOST_ALIASES=${SMARTHOST_ALIASES}"
+      - "TZ=${TZ:-UTC}"
 
   redis:
     image: ${REGISTRY_MIRROR_URL:-}valkey/valkey:7.2
@@ -31,6 +32,7 @@ services:
     environment:
       - "ENABLE_REDIS_EMPTY_PASSWORD=${ENABLE_REDIS_EMPTY_PASSWORD:-false}"
       - "REDIS_PASSWORD=${REDIS_PASSWORD:-redispassword}"
+      - "TZ=${TZ:-UTC}"
     healthcheck:
       test: |
         sh -c '
@@ -57,6 +59,7 @@ services:
       - "MYSQL_PASSWORD=${MYSQL_PASSWORD:-example}"
       - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-password}"
       - "MYSQL_DATABASE=${MYSQL_DATABASE:-misp}"
+      - "TZ=${TZ:-UTC}"
     command: "\
       --innodb-buffer-pool-size=${INNODB_BUFFER_POOL_SIZE:-2048M} \
       --innodb-change-buffering=${INNODB_CHANGE_BUFFERING:-none} \
@@ -155,6 +158,7 @@ services:
       - "ADMIN_ORG_UUID=${ADMIN_ORG_UUID}"
       - "GPG_PASSPHRASE=${GPG_PASSPHRASE}"
       - "ATTACHMENTS_DIR=${ATTACHMENTS_DIR}"
+      - "TZ=${TZ:-UTC}"
       - "ENABLE_THEMES=${ENABLE_THEMES}"
       # OIDC authentication settings
       - "OIDC_ENABLE=${OIDC_ENABLE}"
@@ -318,7 +322,6 @@ services:
       - "PHP_SESSION_COOKIE_SECURE=${PHP_SESSION_COOKIE_SECURE:-true}"
       - "PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN}"
       - "PHP_SESSION_COOKIE_SAMESITE=${PHP_SESSION_COOKIE_SAMESITE:-Lax}"
-      - "PHP_TIMEZONE=${PHP_TIMEZONE:-UTC}"
       # security settings
       - "HSTS_MAX_AGE=${HSTS_MAX_AGE}"
       - "X_FRAME_OPTIONS=${X_FRAME_OPTIONS}"
@@ -348,6 +351,8 @@ services:
       - "./custom/expansion/:/custom/expansion/:Z"
       - "./custom/export_mod/:/custom/export_mod/:Z"
       - "./custom/import_mod/:/custom/import_mod/:Z"
+    environment:  
+      - "TZ=${TZ:-UTC}"
 
   misp-guard:
     profiles:
@@ -366,6 +371,7 @@ services:
     environment:
       - "GUARD_PORT=${GUARD_PORT:-8888}"
       - "GUARD_ARGS=${GUARD_ARGS}"
+      - "TZ=${TZ:-UTC}"
     volumes:
       - ./guard/config.json:/config.json:ro
       - misp_guard_ca:/misp_guard_ca

template.env

@@ -80,6 +80,9 @@ ATTACHMENTS_DIR=
 # enable UI themes
 # ENABLE_THEMES=false
 
+# Setting the timezone (UTC, Europe/Berlin etc.). Default is UTC.
+# TZ="UTC"
+
 # By default, a daily synchronization is performed, but you can modify this by changing the push and pull frequency (in seconds).
 # CRON_PULLALL="86400"
 # CRON_PUSHALL="86400"