From 569927c6442d00144e34690ed5ce588884d917ab Mon Sep 17 00:00:00 2001
From: Youssef <youssef.kaouachi@gmail.com>
Date: Sat, 13 Jun 2026 00:17:15 +0200
Subject: [PATCH] ci: secure docker compose deployments using gitea actions
 secrets

---
 .gitea/workflows/ci.yml | 5 +++++
 docker-compose.yml      | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 60879e9..e29ba6e 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -43,6 +43,11 @@ jobs:
           git checkout ${{ github.sha }}
 
       - name: Deploy with Docker Compose
+        env:
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
         run: |
+          echo "POSTGRES_USER=${DB_USER:-myuser}" > .env
+          echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env
           docker compose down app || true
           docker compose up -d --build app
diff --git a/docker-compose.yml b/docker-compose.yml
index eefb8ce..9f88648 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,8 @@ services:
     image: postgres:16
     container_name: astalange_db
     environment:
-      POSTGRES_USER: myuser
-      POSTGRES_PASSWORD: mypassword
+      POSTGRES_USER: ${POSTGRES_USER:-myuser}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-mypassword}
       POSTGRES_DB: astalange
     ports:
       - "5433:5432"
@@ -32,8 +32,8 @@ services:
       - "8080:8080"
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/astalange
-      - SPRING_DATASOURCE_USERNAME=myuser
-      - SPRING_DATASOURCE_PASSWORD=mypassword
+      - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-myuser}
+      - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD:-mypassword}
     depends_on:
       - db
     restart: always