Merge pull request 'develop' (#63 ) from develop into main

Reviewed-on: #63
Merge pull request 'correction creation user par defaut' (#62 ) from features/crud_entites into develop
2025-12-20 15:04:55 +00:00 · 2025-12-20 15:03:45 +00:00 · 2025-12-20 16:03:12 +01:00
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -12,4 +12,4 @@ EXPOSE 8282

 # Lancer l'application
 #ENTRYPOINT ["java", "-jar", "fiscad.jar"]
-ENTRYPOINT ["sh", "-c", "export SPRING_DATASOURCE_PASSWORD=$(cat /run/secrets/postgresPassword) && exec java -jar fiscad.jar"]
+ENTRYPOINT ["sh", "-c", "export SPRING_DATASOURCE_PASSWORD=$(cat /run/secrets/postgresPassword) && export DEFAULT_USER_NAME=$(cat /run/secrets/defaultUserName) && export DEFAULT_USER_PASSWORD=$(cat /run/secrets/defaultUserPassword) && exec java -jar fiscad.jar"]
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -46,8 +46,8 @@ logging.file.name=/app/logs/fiscad.log

 #app.abs.env.defaultuser = infocad_admin

-app.default-user.username=${DEFAULT_USER_NAME_FILE}
-app.default-user.password=${DEFAULT_USER_PASSWORD_FILE}
+app.default-user.username=${DEFAULT_USER_NAME}
+app.default-user.password=${DEFAULT_USER_PASSWORD}

 app.upload.root=${file.upload_dir}
 app.upload.zips.received=${app.upload.root}/zips/received
Author	SHA1	Message	Date
AKAKPO Aurince	fa7421c35b	Merge pull request 'develop' (#63 ) from develop into main All checks were successful CD - Deploy on main / deploy (push) Successful in 35s Details Reviewed-on: #63	2025-12-20 15:04:55 +00:00
AKAKPO Aurince	f35670c72e	Merge pull request 'correction creation user par defaut' (#62 ) from features/crud_entites into develop Reviewed-on: #62	2025-12-20 15:03:45 +00:00
Aurince AKAKPO	b53f441bf4	correction creation user par defaut All checks were successful CI - Build & Test (develop) / build-and-test (pull_request) Successful in 24s Details	2025-12-20 16:03:12 +01:00