fixed deploy-production.yaml ver 7

Author: cpprismic

.github/workflows/deploy-production.yaml

@@ -81,8 +81,7 @@ jobs:
           echo "CI tests passed for commit $COMMIT"
 
   deploy:
-    # needs: [validate, check-ci-status]
-    needs: [validate]
+    needs: [validate, check-ci-status]
     runs-on: ubuntu-latest
     environment: 
       name: production
@@ -95,7 +94,7 @@ jobs:
         echo "Deployed by: ${{ github.actor }}"
         echo "Time: $(date)"
   
-    - name: Deploy to Production VPS (with password)
+    - name: Deploy to Production VPS
       uses: appleboy/ssh-action@v1.0.3
       with:
         host: ${{ secrets.VPS_HOST_PROD }}
@@ -134,30 +133,22 @@ jobs:
           
           # Останавливаем старый контейнер
           docker-compose down || true
+
+          # export TAG=${{ steps.set-commit.outputs.commit }}
           
           # Обновляем образ
           export TAG=${{ needs.check-ci-status.outputs.commit }}
+          export DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/system-monitor
           echo "Pulling image with tag: $TAG"
           docker-compose pull
+
+          echo "Starting container..."
           docker-compose up -d
           
-          # Проверка статуса контейнеров
-          echo "Waiting for service to start..."
-          sleep 5
-          
-          if docker-compose ps | grep "Up"; then
-            echo "✅ Containers are running!"
-            docker-compose ps
-          else
-            echo "❌ Containers failed to start"
-            docker-compose logs
-            exit 1
-          fi
-          
           # Очистка старых образов
           docker image prune -f
           
-          echo "✅ PRODUCTION DEPLOYMENT COMPLETE!"
+          echo "PRODUCTION DEPLOYMENT COMPLETE!"
           
           # Сохраняем информацию о деплое
           cat > $BACKUP_DIR/deploy-info.txt << EOF

docker-compose.yml

@@ -1,26 +1,53 @@
+# version: '3.8'
+
+# services:
+#   system-monitor:
+#     build: .
+#     container_name: system-monitor
+#     restart: unless-stopped
+#     # Для доступа к системной информации хоста
+#     volumes:
+#       - /proc:/host/proc:ro
+#       - /sys:/host/sys:ro
+#       - /etc:/host/etc:ro
+#     environment:
+#       - TZ=Europe/Moscow
+#     # Запускаем в непрерывном режиме с интервалом 5 секунд
+#     command: ["-c", "5"]
+#     # Ограничения ресурсов
+#     deploy:
+#       resources:
+#         limits:
+#           cpus: '0.5'
+#           memory: 256M
+#     # Логирование
+#     logging:
+#       driver: json-file
+#       options:
+#         max-size: "10m"
+#         max-file: "3"
+
+# docker-compose.yml
 version: '3.8'
 
 services:
   system-monitor:
-    build: .
+    # Убираем build, добавляем image
+    image: ${DOCKER_IMAGE:-cpprismic/system-monitor}:${TAG:-latest}
     container_name: system-monitor
     restart: unless-stopped
-    # Для доступа к системной информации хоста
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /etc:/host/etc:ro
     environment:
       - TZ=Europe/Moscow
-    # Запускаем в непрерывном режиме с интервалом 5 секунд
     command: ["-c", "5"]
-    # Ограничения ресурсов
     deploy:
       resources:
         limits:
           cpus: '0.5'
           memory: 256M
-    # Логирование
     logging:
       driver: json-file
       options: