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

Reviewed-on: #19

docker-compose-prod.yml

@@ -1,11 +1,10 @@
-#version: '3.9'
-
 services:
 
   db:
     image: postgres:15
     container_name: fiscad-db
     restart: always
+
     environment:
       POSTGRES_DB: ${POSTGRES_DB_FISCAD}
       POSTGRES_USER: ${POSTGRES_USER_FISCAD}
@@ -16,21 +15,26 @@ services:
 
     ports:
       - "5432:5432"
+
     volumes:
       - db-data-fiscad:/var/lib/postgresql/data
+
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD}"]
       interval: 10s
       timeout: 5s
       retries: 5
 
+
   app:
     build:
       context: .
       dockerfile: Dockerfile
     container_name: fiscad-app
+    restart: on-failure
     depends_on:
       - db
+
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
       SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
@@ -39,21 +43,32 @@ services:
       SERVER_PORT: 8282
       IO_GMSS_FISCAD_PROFILE: abomey
       SPRING_PROFILES_ACTIVE: abomey
+
+      DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName
+      DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword
+
+    secrets:
+      - postgresPassword
+      - defaultUserName
+      - defaultUserPassword
+
     ports:
       - "8282:8282"
+
     volumes:
       - /fiscad/uploads:/app/uploads
       - /fiscad/jasperReport:/app/jasperReport
       - /fiscad/logs:/app/logs
-    restart: on-failure
+
 
 volumes:
   db-data-fiscad:
 
+
 secrets:
+  postgresPassword:
+    file: ./secrets/postgresPassword.txt
   defaultUserName:
     file: ./secrets/defaultUserName.txt
   defaultUserPassword:
     file: ./secrets/defaultUserPassword.txt
-  postgresPassword:
-    file: ./secrets/postgresPassword.txt