From 58de5c696c5728ec1d9667f5f06a7782a923cb9d Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 5 Feb 2024 14:20:30 +0100 Subject: [PATCH 1/7] Ajout de locales fr --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index b38b62e8..aef0d6d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,13 @@ ENTRYPOINT ["java","-jar","/app/item.jar"] # qui n'est que disponible sous centos/rockylinux. FROM rockylinux:8 as batch-image WORKDIR /scripts/ +#locales fr +# Les locales fr_FR +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 + # 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) # gettext: pour avoir envsubst qui permet de gérer le template tasks.tmpl From 6fc8e071a50f52e1a08cc56571418fe4ce695182 Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 5 Feb 2024 14:41:00 +0100 Subject: [PATCH 2/7] Config CET --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index aef0d6d8..3b29b8f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,12 +49,6 @@ ENTRYPOINT ["java","-jar","/app/item.jar"] # qui n'est que disponible sous centos/rockylinux. FROM rockylinux:8 as batch-image WORKDIR /scripts/ -#locales fr -# Les locales fr_FR -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 # 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,7 +61,7 @@ RUN dnf install -y java-11-openjdk RUN dnf install -y tzdata && \ ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime && \ - echo "Europe/Paris" > /etc/timezone + echo "CET" > /etc/timezone COPY ./docker/batch/itemBatchRestartJobs.sh /scripts/itemBatchRestartJobs.sh RUN chmod +x /scripts/itemBatchRestartJobs.sh From 91a8363384338f8a855803038fb8f482de989b71 Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 5 Feb 2024 14:47:55 +0100 Subject: [PATCH 3/7] Test changement fuseau --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b29b8f0..ab82da5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,12 @@ ENTRYPOINT ["java","-jar","/app/item.jar"] # qui n'est que disponible sous centos/rockylinux. FROM rockylinux:8 as batch-image WORKDIR /scripts/ +#locales fr +# Les locales fr_FR +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 # 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) @@ -61,7 +67,7 @@ RUN dnf install -y java-11-openjdk RUN dnf install -y tzdata && \ ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime && \ - echo "CET" > /etc/timezone + echo "Europe/London" > /etc/timezone COPY ./docker/batch/itemBatchRestartJobs.sh /scripts/itemBatchRestartJobs.sh RUN chmod +x /scripts/itemBatchRestartJobs.sh From 8cea1e895fb943f0ebe8fae9a9d3a771f661c615 Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 5 Feb 2024 14:57:06 +0100 Subject: [PATCH 4/7] =?UTF-8?q?Indication=20des=20version=20des=20librairi?= =?UTF-8?q?es=20postgresql=20et=20jackson-databind=20pour=20r=C3=A9solutio?= =?UTF-8?q?n=20des=20failles=20de=20vuln=C3=A9rabilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index 7fe21783..2a8a203d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -36,10 +36,12 @@ org.postgresql postgresql + 42.5.1 com.fasterxml.jackson.core jackson-databind + 2.14.0-rc1 From 379e59b77a4e8186ad30cf488774d3820e9c8e55 Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Tue, 6 Feb 2024 10:49:56 +0100 Subject: [PATCH 5/7] =?UTF-8?q?MAJ=20des=20fichiers=20application.properti?= =?UTF-8?q?es=20pour=20ne=20pas=20r=C3=A9initialiser=20la=20BDD=20sur=20l'?= =?UTF-8?q?environnement=20de=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/resources/application-dev.properties | 4 ++-- web/src/main/resources/application-test.properties | 2 +- web/src/main/resources/application.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties index ba47d0a9..46b77077 100644 --- a/web/src/main/resources/application-dev.properties +++ b/web/src/main/resources/application-dev.properties @@ -4,10 +4,10 @@ spring.datasource.item.username= spring.datasource.item.password= spring.datasource.item.driver-class-name=org.postgresql.Driver -spring.jpa.item.generate-ddl=true +spring.jpa.item.generate-ddl=false spring.jpa.item.show-sql=true spring.jpa.item.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.item.hibernate.ddl-auto=create-drop +spring.jpa.item.hibernate.ddl-auto=none spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect spring.sql.item.init.mode=never spring.hibernate.item.enable_lazy_load_no_trans=true diff --git a/web/src/main/resources/application-test.properties b/web/src/main/resources/application-test.properties index 3406d052..ebfb1a17 100644 --- a/web/src/main/resources/application-test.properties +++ b/web/src/main/resources/application-test.properties @@ -19,7 +19,7 @@ spring.datasource.basexml.password= spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver spring.jpa.basexml.generate-ddl=false -spring.jpa.basexml.show-sql=true +spring.jpa.basexml.show-sql=false spring.jpa.basexml.properties.hibernate.dialect=fr.abes.item.configuration.OracleCustomDriver spring.jpa.basexml.hibernate.ddl-auto=none spring.jpa.basexml.database-platform=org.hibernate.dialect.Oracle12cDialect diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index ed3e727f..d6abb7f5 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -1,5 +1,5 @@ ########################################## -# Propriétés communes à tous les profils # +# Proprietes communes a tous les profils ########################################## # Configuration du projet (depuis pom.xml) From d5ab1819583c2b45556b4061108b198c9facc06f Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Tue, 6 Feb 2024 11:05:31 +0100 Subject: [PATCH 6/7] Remise en place du fuseau Europe/Paris --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab82da5e..aef0d6d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,7 @@ RUN dnf install -y java-11-openjdk RUN dnf install -y tzdata && \ ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime && \ - echo "Europe/London" > /etc/timezone + echo "Europe/Paris" > /etc/timezone COPY ./docker/batch/itemBatchRestartJobs.sh /scripts/itemBatchRestartJobs.sh RUN chmod +x /scripts/itemBatchRestartJobs.sh From 94c1aec2d5377442a7fe249c46d4c6840b4b11ca Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Tue, 6 Feb 2024 11:25:04 +0100 Subject: [PATCH 7/7] COnf log4j2-dev.xml --- batch/src/main/resources/application-dev.properties | 2 +- batch/src/main/resources/log4j2-dev.xml | 10 +++++----- web/src/main/resources/log4j2-dev.xml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/batch/src/main/resources/application-dev.properties b/batch/src/main/resources/application-dev.properties index 7ff1332d..47140b3f 100644 --- a/batch/src/main/resources/application-dev.properties +++ b/batch/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ spring.datasource.basexml.password= spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver spring.jpa.basexml.generate-ddl=false -spring.jpa.basexml.show-sql=false +spring.jpa.basexml.show-sql=true spring.jpa.basexml.properties.hibernate.dialect=fr.abes.item.configuration.OracleCustomDriver spring.jpa.basexml.hibernate.ddl-auto=none spring.jpa.basexml.database-platform=org.hibernate.dialect.Oracle12cDialect diff --git a/batch/src/main/resources/log4j2-dev.xml b/batch/src/main/resources/log4j2-dev.xml index c2378e10..fbda63e7 100644 --- a/batch/src/main/resources/log4j2-dev.xml +++ b/batch/src/main/resources/log4j2-dev.xml @@ -9,10 +9,10 @@ ${bundle:application:application.name}_debug - 100 MB - 1d - 1 - 10 MB + 200 MB + 15d + 10 + 100 MB @@ -130,4 +130,4 @@ - + \ No newline at end of file diff --git a/web/src/main/resources/log4j2-dev.xml b/web/src/main/resources/log4j2-dev.xml index c2378e10..5b6327f2 100644 --- a/web/src/main/resources/log4j2-dev.xml +++ b/web/src/main/resources/log4j2-dev.xml @@ -9,10 +9,10 @@ ${bundle:application:application.name}_debug - 100 MB - 1d - 1 - 10 MB + 200 MB + 15d + 10 + 100 MB