mirror of
https://github.com/DiouxX/docker-glpi.git
synced 2026-11-05 22:52:33 -05:00
Fix timezone where somtimes apache / php timezone differ from container timezone
This commit is contained in:
1 parent
c59a35788d
commit
d88216d498
3 files changed
+8
-4
No files matched your search
@@ -12,10 +12,10 @@ services:
|
||||
- mysql:mysql
|
||||
restart: always
|
||||
volumes:
|
||||
- "./timezone.ini:/etc/php/7.0/cli/php.ini"
|
||||
- "./timezone.ini:/etc/php/7.0/apache2/php.ini"
|
||||
- "/etc/timezone:/etc/timezone"
|
||||
- "/etc/localtime:/etc/localtime"
|
||||
environment:
|
||||
TIMEZONE: Europe/Paris
|
||||
|
||||
#Mysql Container
|
||||
mysql:
|
||||
@@ -23,4 +23,4 @@ services:
|
||||
container_name: mysql
|
||||
hostname: mysql
|
||||
env_file:
|
||||
- ./mysql.env
|
||||
- ./mysql.env
|
||||
@@ -4,6 +4,10 @@
|
||||
[[ ! "$VERSION_GLPI" ]] \
|
||||
&& VERSION_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/latest | grep tag_name | cut -d '"' -f 4)
|
||||
|
||||
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
|
||||
else echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.0/apache2/conf.d/timezone.ini;
|
||||
fi
|
||||
|
||||
SRC_GLPI="https://github.com/glpi-project/glpi/releases/download/${VERSION_GLPI}/glpi-${VERSION_GLPI}.tgz"
|
||||
TAR_GLPI=glpi-${VERSION_GLPI}.tgz
|
||||
FOLDER_GLPI=glpi/
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
Europe/Paris
|
||||
date.timezone = "Europe/Paris"
|
||||
Reference in new issue
Block a user