From f69285b7f382416e887f64f7b65326ee3b188714 Mon Sep 17 00:00:00 2001
From: parsa aghaei <p.aghaei@hoshmand.local>
Date: Sun, 9 Aug 2026 22:28:26 +0330
Subject: [PATCH] deploy.yml updated

---
 .gitea/workflows/deploy.yml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 70a390a..e227a0d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,14 +10,13 @@ jobs:
   deploy:
     runs-on: canina
     steps:
-      - name: Deploy Canina Directly
+      - name: Deploy Canina
         env:
           BRANCH: ${{ github.ref_name }}
         run: |
-          # 1. اضافه کردن آی‌پی به فایل hosts
           echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts
 
-          # 2. تعریف متغیرها
+          # تعریف متغیرها
           if [ "$BRANCH" == "develop" ]; then
               COMPOSE_FILE="compose.stage.yml"
               TARGET_DIR="/opt/services/canina/stage"
@@ -36,10 +35,9 @@ jobs:
               CONTAINER_PREFIX="canino_backend_prod"
           fi
 
-          # 3. ساخت پوشه‌ی مقصد
           mkdir -p "$TARGET_DIR"
 
-          # 4. کلون کردن یا آپدیت پروژه (فایل‌ها در TARGET_DIR دانلود می‌شوند)
+          # کلون کردن / آپدیت
           if [ ! -d "$TARGET_DIR/.git" ]; then
               echo "Cloning repository into $TARGET_DIR..."
               git clone -b "$BRANCH" https://git.parsaaghayi.ir/parsa/canina.git "$TARGET_DIR"
@@ -51,18 +49,11 @@ jobs:
               cd -
           fi
 
-          # 🟢 قدم حیاتی: اول برو به پوشه‌ی پروژه، بعد فایل‌ها را کپی کن!
-          cd "$TARGET_DIR"
-
+          # ✅ اینبار با آدرس کامل کپی می‌کنیم
           echo "Copying configuration files to $TARGET_DIR..."
-          cp "$COMPOSE_FILE" docker-compose.yml
-          sed -i 's/- REDIS_PORT: 6379/- REDIS_PORT=6379/g' docker-compose.yml 2>/dev/null || true
+          cp "$PWD/scripts/$COMPOSE_FILE" "$TARGET_DIR/docker-compose.yml"
 
-          echo "Patching nginx.conf for environment..."
-          cp nginx.conf nginx.conf
-          sed -i "s/__BACKEND_HOST__/${BACKEND_HOST}/g" nginx.conf
-          sed -i "s/__APP_HOST__/${APP_HOST}/g" nginx.conf
-          sed -i "s/__ADMIN_HOST__/${ADMIN_HOST}/g" nginx.conf
+          cd "$TARGET_DIR"
 
           echo "Building Docker images..."
           docker compose build \
@@ -72,10 +63,7 @@ jobs:
           echo "Starting containers..."
           docker compose up -d
 
-          echo "Waiting for backend to start..."
           sleep 15
-
-          echo "Running migrations and seeding database..."
           docker exec "$CONTAINER_PREFIX" npx prisma migrate deploy || true
           docker exec "$CONTAINER_PREFIX" npx prisma db seed || true