From 09af728f80f71cddaee5d197c0be71629dc083c2 Mon Sep 17 00:00:00 2001
From: gitea <the.dark.mist23@gmail.com>
Date: Wed, 26 Nov 2025 13:39:16 +0330
Subject: [PATCH] refactored deployment phase

---
 .gitea/workflows/cicd.yaml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/cicd.yaml b/.gitea/workflows/cicd.yaml
index 793b8e4..32445b4 100644
--- a/.gitea/workflows/cicd.yaml
+++ b/.gitea/workflows/cicd.yaml
@@ -84,11 +84,22 @@ jobs:
           ssh-add ~/.ssh/id_ed25519
           ssh-keyscan -p ${{ secrets.SERVER_PORT }} ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts
 
-      - name: Copy tar to server
+      - name: Copy files to server
         run: |
+          # Copy image tar
           scp -o StrictHostKeyChecking=no -P ${{ secrets.SERVER_PORT }} \
             demo-app.tar \
-            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:'${{ secrets.DEPLOY_PATH }}/demo-app.tar'
+            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:"${{ secrets.DEPLOY_PATH }}/demo-app.tar"
+
+          # Copy docker-compose file
+          scp -o StrictHostKeyChecking=no -P ${{ secrets.SERVER_PORT }} \
+            docker-compose.yml \
+            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:"${{ secrets.DEPLOY_PATH }}/docker-compose.yml"
+
+          # Copy nginx config directory (used as volume in docker-compose.yml)
+          scp -o StrictHostKeyChecking=no -P ${{ secrets.SERVER_PORT }} -r \
+            nginx_user_conf.d \
+            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:"${{ secrets.DEPLOY_PATH }}/nginx_user_conf.d"
 
       - name: Deploy on server
         run: |
@@ -106,9 +117,16 @@ jobs:
             # Load the new image from the tarball
             docker load -i demo-app.tar
 
+            # Make sure we actually have a compose file here
+            if [ ! -f docker-compose.yml ]; then
+              echo "ERROR: docker-compose.yml not found in \$(pwd)" >&2
+              ls -la
+              exit 1
+            fi
+
             # Restart the compose stack
-            docker compose down
-            docker compose --env-file .env up -d --remove-orphans
+            docker compose -f docker-compose.yml down
+            docker compose -f docker-compose.yml --env-file .env up -d --remove-orphans
 
             # Clean up
             rm demo-app.tar