From 7d52276b314fe0b481bd69c4be690f9d38eb56aa Mon Sep 17 00:00:00 2001
From: vladp <vlad.popovtsevv@gmail.com>
Date: Fri, 30 Jan 2026 19:27:01 +0700
Subject: [PATCH] dev add tariff and temp flag for files

---
 infrastructure/jenkins/deploy-backend.groovy | 58 +++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/infrastructure/jenkins/deploy-backend.groovy b/infrastructure/jenkins/deploy-backend.groovy
index 8184794..4e8c147 100644
--- a/infrastructure/jenkins/deploy-backend.groovy
+++ b/infrastructure/jenkins/deploy-backend.groovy
@@ -49,22 +49,37 @@ pipeline {
                             string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
-                sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER '
+                # Тестируем подключение сначала
+                echo "Testing SSH connection..."
+                if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
+                    echo "SSH connection OK"
+                else
+                    echo "SSH connection failed"
+                    exit 1
+                fi
+
+                # Основная команда
+                sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
                     cd /opt/deployments/${params.BRANCH}-${params.PORT}
 
-                    echo "1. Останавливаем старые контейнеры порта ${params.PORT}..."
-                    docker stop app-backend-${params.PORT} 2>/dev/null || echo "Контейнер не найден"
-                    docker rm app-backend-${params.PORT} 2>/dev/null || echo "Контейнер не найден"
-                    docker stop postgres-${params.PORT} 2>/dev/null || echo "Контейнер БД не найден"
-                    docker rm postgres-${params.PORT} 2>/dev/null || echo "Контейнер БД не найден"
-                    docker stop file-storage-${params.PORT} 2>/dev/null || echo "Контейнер storage не найден"
-                    docker rm file-storage-${params.PORT} 2>/dev/null || echo "Контейнер storage не найден"
+                    echo '1. Создаем изолированную сеть для порта ${params.PORT}...'
+                    docker network create app-network-${params.PORT} 2>/dev/null || echo 'Сеть уже существует'
 
-                    echo "2. Запускаем БД..."
+                    echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
+                    docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
+                    docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
+                    docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
+                    docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
+                    docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
+                    docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
+
+                    echo '3. Запускаем БД...'
                     docker run -d \\
                       --name postgres-${params.PORT} \\
-                      --network app-network \\
+                      --network app-network-${params.PORT} \\
+                      --network-alias no_copy_${params.PORT} \\
                       --network-alias database-${params.PORT} \\
+                      --network-alias db-${params.PORT} \\
                       -p ${params.PORT}0:5432 \\
                       -e POSTGRES_DB=no_copy_${params.PORT} \\
                       -e POSTGRES_USER=${DB_USER} \\
@@ -72,42 +87,43 @@ pipeline {
                       -v pgdata_${params.PORT}:/var/lib/postgresql/data \\
                       postgres:17.7
 
-                    echo "3. Запускаем storage..."
+                    echo '4. Запускаем storage...'
                     docker run -d \\
                       --name file-storage-${params.PORT} \\
-                      --network app-network \\
+                      --network app-network-${params.PORT} \\
                       -v uploads_data_${params.PORT}:/storage:rw \\
                       alpine:latest tail -f /dev/null
 
-                    echo "4. Ждем БД..."
+                    echo '5. Ждем БД...'
                     sleep 15
 
-                    echo "5. Собираем приложение..."
+                    echo '6. Собираем приложение...'
                     docker build --no-cache -t app-backend-${params.PORT}:latest .
 
-                    echo "6. Запускаем приложение..."
+                    echo '7. Запускаем приложение...'
                     docker run -d \\
                       --name app-backend-${params.PORT} \\
-                      --network app-network \\
+                      --network app-network-${params.PORT} \\
                       -p ${params.PORT}:8080 \\
                       -v uploads_data_${params.PORT}:/data/uploads:rw \\
                       -e POSTGRES_DB=no_copy_${params.PORT} \\
                       -e POSTGRES_USER=${DB_USER} \\
                       -e POSTGRES_PASSWORD=${DB_PASSWORD} \\
                       -e POSTGRES_PORT=5432 \\
-                      -e POSTGRES_HOST=database-${params.PORT} \\
+                      -e POSTGRES_HOST=no_copy_${params.PORT} \\
+                      -e FILE_STORAGE_PATH=/data/uploads \\
                       app-backend-${params.PORT}:latest
 
-                    echo "7. Проверка..."
+                    echo '8. Проверка...'
                     sleep 10
                     
                     if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
-                        echo "Приложение работает на порту ${params.PORT}"
+                        echo 'Приложение работает на порту ${params.PORT}'
                     else
-                        echo "Проверка health не удалась"
+                        echo 'Проверка health не удалась'
                         docker logs app-backend-${params.PORT} --tail=20
                     fi
-                '
+                "
                 """
                     }
                 }