From 9336715c18ee37c650ac63c60bf56cd2fdf54ae2 Mon Sep 17 00:00:00 2001
From: Aurince AKAKPO <judaur2005@gmail.com>
Date: Wed, 17 Dec 2025 17:23:32 +0100
Subject: [PATCH] correction docker composer

---
 .gitea/workflows/cd-main.yml | 23 +++++++++++++++++++----
 docker-compose-prod.yml      | 17 +++++++++++++++--
 docker-compose.yml           |  2 +-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/cd-main.yml b/.gitea/workflows/cd-main.yml
index 4132e04..ce3a009 100644
--- a/.gitea/workflows/cd-main.yml
+++ b/.gitea/workflows/cd-main.yml
@@ -69,8 +69,7 @@ jobs:
             docker version || true
           fi
 
-      # 7) Fournir la configuration NON sensible (OBLIGATOIRE)
-      #    (POSTGRES_DB et POSTGRES_USER ne sont PAS des secrets)
+      # 7) Fournir la configuration NON sensible
       - name: Export database configuration
         shell: sh
         run: |
@@ -102,13 +101,29 @@ jobs:
           docker-compose -f docker-compose-prod.yml down --remove-orphans
           docker-compose -f docker-compose-prod.yml up -d --build
 
-      # 11) Nettoyage des secrets (OBLIGATOIRE)
+      # 11) ✅ TEST BLOQUANT : connexion PostgreSQL
+      - name: Test database connection
+        shell: sh
+        run: |
+          echo "⏳ Waiting for PostgreSQL to be ready..."
+          sleep 10
+
+          echo "🔍 Testing database connection..."
+          docker exec fiscad-db sh -c "
+            export PGPASSWORD=\$(cat /run/secrets/postgresPassword) &&
+            psql -h localhost \
+                 -U ${POSTGRES_USER_FISCAD} \
+                 -d ${POSTGRES_DB_FISCAD} \
+                 -c 'SELECT 1;'
+          "
+
+      # 12) Nettoyage des secrets (OBLIGATOIRE)
       - name: Cleanup secrets
         if: always()
         shell: sh
         run: rm -rf secrets
 
-      # 12) Nettoyage des images Docker inutilisées
+      # 13) Nettoyage des images Docker inutilisées
       - name: Cleanup unused Docker images
         shell: sh
         run: docker image prune -f || true
\ No newline at end of file
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 4b96665..e2c7aca 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+#version: '3.9'
 
 services:
 
@@ -10,6 +10,10 @@ services:
       POSTGRES_DB: ${POSTGRES_DB_FISCAD}
       POSTGRES_USER: ${POSTGRES_USER_FISCAD}
       POSTGRES_PASSWORD_FILE: /run/secrets/postgresPassword
+
+    secrets:
+      - postgresPassword
+
     ports:
       - "5432:5432"
     volumes:
@@ -31,6 +35,7 @@ services:
       SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
       SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
       SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgresPassword
+
       SERVER_PORT: 8282
       IO_GMSS_FISCAD_PROFILE: abomey
       SPRING_PROFILES_ACTIVE: abomey
@@ -43,4 +48,12 @@ services:
     restart: on-failure
 
 volumes:
-  db-data-fiscad:
\ No newline at end of file
+  db-data-fiscad:
+
+secrets:
+  defaultUserName:
+    file: ./secrets/defaultUserName.txt
+  defaultUserPassword:
+    file: ./secrets/defaultUserPassword.txt
+  postgresPassword:
+    file: ./secrets/postgresPassword.txt
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index cce17e0..4c5e7b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+#version: '3.9'
 
 services: