Merge pull request 'correction docker composer avec les secrets' (#24) from features/crud_entites into develop

Reviewed-on: #24

.gitea/workflows/cd-main.yml

@@ -97,7 +97,8 @@ jobs:
         run: |
           export COMPOSE_PROJECT_NAME=fiscad
 
-          cd $GITHUB_WORKSPACE
+          cd "$GITHUB_WORKSPACE"
+          ls -l secrets/
           
           docker-compose -f docker-compose-prod.yml pull || true
           docker-compose -f docker-compose-prod.yml down --remove-orphans

docker-compose-prod.yml

@@ -67,8 +67,8 @@ volumes:
 
 secrets:
   postgresPassword:
-    file: ${GITHUB_WORKSPACE}/secrets/postgresPassword.txt
+    file: ./secrets/postgresPassword.txt
   defaultUserName:
-    file: ${GITHUB_WORKSPACE}/secrets/defaultUserName.txt
+    file: ./secrets/defaultUserName.txt
   defaultUserPassword:
-    file: ${GITHUB_WORKSPACE}/secrets/defaultUserPassword.txt
+    file: ./secrets/defaultUserPassword.txt

src/main/resources/application-abomey.properties

@@ -14,5 +14,5 @@ io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE}
 # PROD ENV
 spring.datasource.url=${SPRING_DATASOURCE_URL}
 spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
-spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD_FILE}
 

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:}
-app.default-user.password=${DEFAULT_USER_PASSWORD:}
+app.default-user.username=${DEFAULT_USER_NAME_FILE}
+app.default-user.password=${DEFAULT_USER_PASSWORD_FILE}
 
 app.upload.root=${file.upload_dir}
 app.upload.zips.received=${app.upload.root}/zips/received