diff --git a/.gitea/workflows/cd-main.yml b/.gitea/workflows/cd-main.yml index b7994a0..b9ae13c 100644 --- a/.gitea/workflows/cd-main.yml +++ b/.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 diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 7d20979..488b571 100644 --- a/docker-compose-prod.yml +++ b/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 \ No newline at end of file + file: ./secrets/defaultUserPassword.txt \ No newline at end of file diff --git a/src/main/resources/application-abomey.properties b/src/main/resources/application-abomey.properties index 0ee37cf..e7f38a0 100755 --- a/src/main/resources/application-abomey.properties +++ b/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} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ee9f49f..f4afbd1 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:} -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