From b08be9b646780145b5ab7e799393b929aa0665d4 Mon Sep 17 00:00:00 2001
From: Liosha <Liosha84@gmail.com>
Date: Mon, 27 Apr 2026 12:45:52 +0300
Subject: [PATCH] production and staging(development)

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

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 4757bcf..cd6680c 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -5,8 +5,8 @@ on:
 
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-latest  # Работаем прямо на хосте helsinki-runner
-    # БЛОК container УДАЛЕН, чтобы избежать ошибок сокета и путей
+    runs-on: ubuntu-latest  # Работаем прямо на хосте сервера
+    # Блок container УДАЛЕН, чтобы не было ошибки "command not found"
 
     steps:
       - name: Checkout code
@@ -14,21 +14,27 @@ jobs:
 
       - name: Build Docker Image
         run: |
-          # Условие для тега образа
-          TAG=$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest")
+          # Определяем тег в зависимости от ветки
+          if [[ "${{ github.ref }}" == "refs/heads/production" ]]; then
+            TAG="prod-latest"
+          else
+            TAG="stg-latest"
+          fi
           docker build -t jambotron-app:$TAG .
 
       - name: Deploy Monolith
         run: |
-          # Выбираем настройки в зависимости от ветки
+          # Настраиваем переменные окружения
           if [[ "${{ github.ref }}" == "refs/heads/production" ]]; then
             NAME="jambotron-prod"
-            DB_DB="jambotron_prod"
+            DB_URL="jdbc:postgresql://jambotron-db-server:5432/jambotron_prod"
             DOMAIN="jambotron.com"
+            TAG="prod-latest"
           else
             NAME="jambotron-staging"
-            DB_DB="jambotron_stg"
+            DB_URL="jdbc:postgresql://jambotron-db-server:5432/jambotron_stg"
             DOMAIN="staging.jambotron.com"
+            TAG="stg-latest"
           fi
 
           docker stop $NAME || true
@@ -40,9 +46,9 @@ jobs:
             --restart always \
             -v /var/run/docker.sock:/var/run/docker.sock \
             -e SPRING_PROFILES_ACTIVE=prod \
-            -e SPRING_DATASOURCE_URL=jdbc:postgresql://jambotron-db-server:5432/$DB_DB \
+            -e SPRING_DATASOURCE_URL=$DB_URL \
             -e SPRING_DATASOURCE_USERNAME=jambotron_admin \
             -e SPRING_DATASOURCE_PASSWORD=jambo_secret_pass \
             -l "caddy=$DOMAIN" \
             -l 'caddy.reverse_proxy={{upstreams 8081}}' \
-            jambotron-app:$([[ "${{ github.ref }}" == "refs/heads/production" ]] && echo "prod-latest" || echo "stg-latest")
\ No newline at end of file
+            jambotron-app:$TAG
\ No newline at end of file