From 5d8c7b0724536dd8845f6047f978c8e901102b8f Mon Sep 17 00:00:00 2001
From: Julien Aldon <julien2.aldon@epitech.eu>
Date: Mon, 12 Jan 2026 13:10:10 +0100
Subject: [PATCH] fix docker compose and deploy.yaml

---
 .gitea/workflows/deploy.yaml |  7 +++++--
 docker-compose.yml           | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 9f6e0b3..de03938 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -10,9 +10,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-
+      - name: init environment
+        run: |
+          mkdir -p secrets
+          cp /opt/bookshelf/secrets/bookshelf.env secrets/bookshelf.env
       - name: Build & deploy
         run: |
           git pull
-          docker compose up -d --build
+          docker compose --env-file secrets/bookshelf.env up -d --build
           docker compose config
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 3cac1ba..b43b7a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,13 @@ services:
       context: .
       dockerfile: back/Dockerfile
     restart: always
-    env_file: /opt/bookshelf/secrets/bookshelf.env
+    environment:
+      ORIGIN: ${SERVICE_ORIGIN}
+      DB_HOST: database
+      DB_USER: ${MARIADB_USER}
+      DB_PASS: ${MARIADB_PASSWORD}
+      DB_NAME: ${MARIADB_DATABASE}
+      SECRET_KEY: ${SERVICE_SECRET_KEY}
     ports:
       - 8000:8000
     depends_on:
@@ -21,7 +27,11 @@ services:
   database:
     image: mariadb
     restart: always
-    env_file: /opt/bookshelf/secrets/bookshelf.env
+    environment:
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
+      MARIADB_DATABASE: ${MARIADB_DATABASE}
     volumes:
       - db:/var/lib/mysql
       - ./back/db/:/docker-entrypoint-initdb.d/