Merge branch 'main' into develop

# Conflicts: # Dockerfile
abes-esr · Mar 21, 2024 · c1c26a3 · c1c26a3
2 parents 4f05a7d + 3c622e5
commit c1c26a3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -55,7 +55,6 @@ RUN dnf install langpacks-fr glibc-all-langpacks -y
 ENV LANG fr_FR.UTF-8
 ENV LANGUAGE fr_FR:fr
 ENV LC_ALL fr_FR.UTF-8
-ENV TZ=Europe/Paris
 
 # systeme pour les crontab
 # cronie: remplacant de crond qui support le CTRL+C dans docker (sans ce système c'est compliqué de stopper le conteneur)
@@ -67,8 +66,8 @@ COPY ./docker/batch/tasks.tmpl /etc/cron.d/tasks.tmpl
 RUN dnf install -y java-11-openjdk
 
 RUN dnf install -y tzdata && \
-    ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \
-    echo $TZ > /etc/timezone
+    ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime && \
+    echo "Europe/London" > /etc/timezone
 
 COPY ./docker/batch/itemBatchRestartJobs.sh /scripts/itemBatchRestartJobs.sh
 RUN chmod +x /scripts/itemBatchRestartJobs.sh