diff --git a/Dockerfile b/Dockerfile index 0186780..3ab9f43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] \ No newline at end of file +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"] \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 33c689e..5dc9ab5 100755 --- 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