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

Merge pull request 'develop' (#25) from develop into main
Some checks failed
CD - Deploy on main / deploy (push) Failing after 33s
Details

Browse Source 
Reviewed-on: #25
This commit was merged in pull request #25.
This commit is contained in:
AKAKPO Aurince
2025-12-17 17:14:31 +00:00
parent 39de1c48c0 d92a2b2503
commit 14feb49dcd
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,8 @@ jobs:
run: | run: |
export COMPOSE_PROJECT_NAME=fiscad 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 pull || true
docker-compose -f docker-compose-prod.yml down --remove-orphans docker-compose -f docker-compose-prod.yml down --remove-orphans

6
docker-compose-prod.yml
View File

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

2
src/main/resources/application-abomey.properties
View File

@@ -14,5 +14,5 @@ io.gmss.fiscad.profile=${IO_GMSS_FISCAD_PROFILE}
# 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_FILE}

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

@@ -46,8 +46,8 @@ logging.file.name=/app/logs/fiscad.log
#app.abs.env.defaultuser = infocad_admin #app.abs.env.defaultuser = infocad_admin
app.default-user.username=${DEFAULT_USER_NAME:} app.default-user.username=${DEFAULT_USER_NAME_FILE}
app.default-user.password=${DEFAULT_USER_PASSWORD:} app.default-user.password=${DEFAULT_USER_PASSWORD_FILE}
app.upload.root=${file.upload_dir} app.upload.root=${file.upload_dir}
app.upload.zips.received=${app.upload.root}/zips/received app.upload.zips.received=${app.upload.root}/zips/received