healthcehck for git-runner

.gitea/workflows/deploy.yaml

@@ -23,11 +23,12 @@ jobs:
           ssh_host: ${{ secrets.SSH_HOST }}
 
       - name: 📦 Create backup of data/ folder
+        if: ${{ vars.DEPLOY_BACKUP_ENABLED == 'true' }}
         env:
           SSHPASS: ${{ secrets.SSH_PASSWORD }}
           SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
-          DEPLOY_DIRECTORY: ${{ secrets.DEPLOY_DIRECTORY }}
+          DEPLOY_DIRECTORY: ${{ vars.DEPLOY_DIRECTORY }}
           REF_NAME: ${{ env.CLEAN_REF_NAME }}
         run: |
           sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT
@@ -42,13 +43,13 @@ jobs:
             echo "Creating backup of data/ into \${BACKUP_FILE}..."
             
             if [ -d "data" ]; then
-              tar -czf "\${BACKUP_FILE}" data
+              echo "$SSHPASS" | sudo -S tar -czf "\${BACKUP_FILE}" data
               echo "✅ Backup created successfully!"
             else
               echo "⚡️ No data/ folder, backup creation skipped."
             fi
 
-            find backups/ -type f -name "backup-*.tar.gz" -mtime +7 -delete
+            echo "$SSHPASS" | sudo -S find backups/ -type f -name "backup-*.tar.gz" -mtime +7 -delete
           EOT
 
       - name: 🏗️ Create docker-compose file
@@ -56,7 +57,7 @@ jobs:
           SSHPASS: ${{ secrets.SSH_PASSWORD }}
           SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
-          DEPLOY_DIRECTORY: ${{ secrets.DEPLOY_DIRECTORY }}
+          DEPLOY_DIRECTORY: ${{ vars.DEPLOY_DIRECTORY }}
           REF_NAME: ${{ env.CLEAN_REF_NAME }}
         run: |
           sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" \
@@ -71,7 +72,7 @@ jobs:
           SSHPASS: ${{ secrets.SSH_PASSWORD }}
           SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
-          DEPLOY_DIRECTORY: ${{ secrets.DEPLOY_DIRECTORY }}
+          DEPLOY_DIRECTORY: ${{ vars.DEPLOY_DIRECTORY }}
           BESZEL_AGENT_KEY: ${{ secrets.BESZEL_AGENT_KEY }}
           BESZEL_AGENT_TOKEN: ${{ secrets.BESZEL_AGENT_TOKEN }}
           BESZEL_HUB_URL: ${{ vars.BESZEL_HUB_URL }}
@@ -117,7 +118,9 @@ jobs:
           SSHPASS: ${{ secrets.SSH_PASSWORD }}
           SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
-          DEPLOY_DIRECTORY: ${{ secrets.DEPLOY_DIRECTORY }}
+          DEPLOY_DIRECTORY: ${{ vars.DEPLOY_DIRECTORY }}
+          DEPLOY_LOG_FILE: /tmp/deploy-${{ env.CLEAN_REF_NAME }}.log
+          DRY_RUN_ENABLED: ${{ vars.DEPLOY_DRY_RUN_ENABLED }}
           REF_NAME: ${{ env.CLEAN_REF_NAME }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_DEPLOY_BOT_TOKEN }}
           TELEGRAM_CHAT: ${{ secrets.TELEGRAM_DEPLOY_CHAT_ID }}
@@ -128,7 +131,6 @@ jobs:
           FAILURE_MESSAGE: |-
             ❌ <b>Ошибка деплоя!</b>
             Релиз: <code>${{ gitea.ref_name }}</code>
-          DEPLOY_LOG_FILE: /tmp/deploy-${{ env.CLEAN_REF_NAME }}.log
         run: |
           sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT
             set -e
@@ -136,8 +138,14 @@ jobs:
 
             nohup bash -c '
               sleep 5
+
+              if [ "${DRY_RUN_ENABLED}" = "true" ]; then
+                DRY_RUN_FLAG="--dry-run"
+              else
+                DRY_RUN_FLAG=""
+              fi
               
-              if docker compose --dry-run -f "docker-compose-${REF_NAME}.yml" up -d --remove-orphans > ${DEPLOY_LOG_FILE} 2>&1; then
+              if docker compose \${DRY_RUN_FLAG} -f "docker-compose-${REF_NAME}.yml" up -d --remove-orphans > ${DEPLOY_LOG_FILE} 2>&1; then
                 curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
                   --proxy "${PROXY_URL}" \
                   -d "chat_id=${TELEGRAM_CHAT}" \

docker-compose.yml

@@ -99,6 +99,12 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     secrets:
       - gitea_runner_registration_token
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:9101/healthz"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 
 networks:
   default: