judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#37) from develop into main
All checks were successful
CD - Deploy on main / deploy (push) Successful in 34s
Details

Browse Source 
Reviewed-on: #37
This commit was merged in pull request #37.
This commit is contained in:
AKAKPO Aurince
2025-12-20 10:02:57 +00:00
parent c8b0457195 02b0a937b4
commit 9d6d278d78
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@@ -1,3 +1,3 @@
POSTGRES_DB=abomey_db POSTGRES_DB=fiscad_db
POSTGRES_USER=infocad_user POSTGRES_USER=fiscad_user
POSTGRES_PASSWORD=W5fwD({9*q53 POSTGRES_PASSWORD=W5fwD({9*q53

5
.gitea/workflows/cd-main.yml
View File

@@ -98,6 +98,7 @@ jobs:
cd "$GITHUB_WORKSPACE" cd "$GITHUB_WORKSPACE"
echo "Workspace: $(pwd)" echo "Workspace: $(pwd)"
cat secrets/postgresPassword.txt
ls -l secrets/ ls -l secrets/
docker-compose -f docker-compose-prod.yml pull || true docker-compose -f docker-compose-prod.yml pull || true
@@ -123,9 +124,9 @@ jobs:
-U ${POSTGRES_USER_FISCAD} \ -U ${POSTGRES_USER_FISCAD} \
-d ${POSTGRES_DB_FISCAD} \ -d ${POSTGRES_DB_FISCAD} \
-c 'SELECT 1;' -c 'SELECT 1;'
" "
# 11) Nettoyage des secrets (sécurité OBLIGATOIRE) # 11) OK Nettoyage des secrets (sécurité OBLIGATOIRE)
- name: Cleanup secrets - name: Cleanup secrets
if: always() if: always()
shell: sh shell: sh

4
docker-compose-prod.yml
View File

@@ -41,8 +41,8 @@ services:
SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgresPassword SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgresPassword
SERVER_PORT: 8282 SERVER_PORT: 8282
IO_GMSS_FISCAD_PROFILE: abomey IO_GMSS_FISCAD_PROFILE: dgi
SPRING_PROFILES_ACTIVE: abomey SPRING_PROFILES_ACTIVE: dgi
DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName
DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword

12
src/main/resources/application-dgi.properties
View File

@@ -7,11 +7,11 @@ io.gmss.fiscad.profile=dgi
#spring.datasource.password=W5fwD({9*q53 #spring.datasource.password=W5fwD({9*q53
# LOCAL ENV # LOCAL ENV
spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi #spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
spring.datasource.username=infocad_user #spring.datasource.username=infocad_user
spring.datasource.password=W5fwD({9*q53 #spring.datasource.password=W5fwD({9*q53
# PROD ENV # PROD ENV
#spring.datasource.url=${SPRING_DATASOURCE_URL} spring.datasource.url=${SPRING_DATASOURCE_URL}
#spring.datasource.username=${SPRING_DATASOURCE_USERNAME} spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}

4
src/main/resources/application.properties
View File

@@ -1,6 +1,6 @@
#spring.profiles.active=${SPRING_PROFILES_ACTIVE} spring.profiles.active=${SPRING_PROFILES_ACTIVE}
#spring.profiles.active=abomey #spring.profiles.active=abomey
spring.profiles.active=dgi #spring.profiles.active=dgi
spring.jpa.properties.hibernate.id.new_generator_mappings=false spring.jpa.properties.hibernate.id.new_generator_mappings=false
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
spring.jpa.open-in-view=false spring.jpa.open-in-view=false