develop #63

Merged
judaur2005 merged 2 commits from develop into main 2025-12-20 15:04:55 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit f35670c72e - Show all commits

View File

@@ -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"]

View File

@@ -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