Skip to content

Commit c233f55

Browse files
Bug-fix for : Not all supervisord use TZ (#401)
* 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. * Fix sed command for date.timezone configuration switch delimitter `/` to `|` * Fix sed command for date.timezone configuration Remove the space from the pattern (`= .*` → `=.*`) to make it more flexible. * Remove timezone setting for broader compatibility Remove setting of /etc/timezone for compatibility. It appears that not all Supervisors use the TZ value.
1 parent 44049e7 commit c233f55

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

core/files/entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ export SUPERVISOR_PASSWORD=${SUPERVISOR_PASSWORD:-supervisor}
105105

106106
# Setting Timezone for supervisord
107107
update-alternatives --install /etc/localtime localtime /usr/share/zoneinfo/${TZ} 0
108-
# Also set /etc/timezone for broader compatibility
109-
echo "${TZ}" > /etc/timezone
110108

111109
# Hinders further execution when sourced from other scripts
112110
if [[ "${BASH_SOURCE[0]}" != "$0" ]]; then

0 commit comments

Comments
 (0)