From 1f59347d874d69aeb6d6beb2c76cc7bc86d8b97d Mon Sep 17 00:00:00 2001
From: xoliqberdiyev <xoliqberdiyevbehruz12@gmail.com>
Date: Fri, 24 Apr 2026 18:42:11 +0500
Subject: [PATCH 1/2] fix

---
 .github/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 3dcebf5..8ce6d39 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -142,7 +142,7 @@ jobs:
               'SECRET_KEY=${{ secrets.SECRET_KEY }}' \
               'DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}' \
               'DEBUG=False' \
-              'PORT=8085' \
+              'PORT=8055' \
               > .env
 
             # .env dan barcha o'zgaruvchilarni export qilamiz

From b02078e6185ac442e920f4bbd6385ef04bedc616 Mon Sep 17 00:00:00 2001
From: xoliqberdiyev <xoliqberdiyevbehruz12@gmail.com>
Date: Fri, 24 Apr 2026 18:49:34 +0500
Subject: [PATCH 2/2] cha

---
 .github/workflows/deploy.yaml | 36 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 8ce6d39..d5f0419 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -125,6 +125,7 @@ jobs:
               rm -rf "$DIR"
               cd "$PROJECTS"
               git clone "$REPO_URL" "${{ env.PROJECT_NAME }}"
+              echo "Clone qilindi"
             fi
 
             cd "$DIR"
@@ -132,22 +133,25 @@ jobs:
             git fetch origin main
             git reset --hard origin/main
 
-            printf '%s\n' \
-              'DB_HOST=postgres' \
-              'DB_NAME=sifatbahodb' \
-              'DB_PORT=5432' \
-              'DB_USER=${{ secrets.DB_USER }}' \
-              'DB_PASSWORD=${{ secrets.DB_PASSWORD }}' \
-              'REDIS_URL=redis://redis:6379' \
-              'SECRET_KEY=${{ secrets.SECRET_KEY }}' \
-              'DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}' \
-              'DEBUG=False' \
-              'PORT=8055' \
-              > .env
+            cp .env.example .env
 
-            # .env dan barcha o'zgaruvchilarni export qilamiz
-            set -a
-            source .env
-            set +a
+            update_env() {
+              local env_file=".env"
+              for kv in "$@"; do
+                local key="${kv%%=*}"
+                local value="${kv#*=}"
+                if grep -q "^$key=" "$env_file"; then
+                  sed -i "s|^$key=.*|$key=$value|" "$env_file"
+                else
+                  echo "$key=$value" >> "$env_file"
+                fi
+              done
+            }
 
+            update_env \
+              "DB_HOST=postgres" \
+              "DB_NAME=sifatbahodb" \
+              "DB_PORT=5432" \
+              "DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}"
+            export PORT=8085
             docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth