From 3a9a5b48a2244d26ac65cff297874b2ddb4297a4 Mon Sep 17 00:00:00 2001 From: vladp Date: Wed, 7 Jan 2026 14:10:35 +0700 Subject: [PATCH] update types --- infrastructure/jenkins/deploy.groovy | 180 ++++-------------- .../ru/soune/nocopy/entity/file/FileType.java | 2 +- 2 files changed, 40 insertions(+), 142 deletions(-) diff --git a/infrastructure/jenkins/deploy.groovy b/infrastructure/jenkins/deploy.groovy index a05e8ca..7611efe 100644 --- a/infrastructure/jenkins/deploy.groovy +++ b/infrastructure/jenkins/deploy.groovy @@ -7,7 +7,6 @@ pipeline { defaultValue: 'dev', description: 'Ветка для деплоя' ) - string( name: 'SERVER', defaultValue: '92.242.61.23', @@ -51,156 +50,57 @@ pipeline { sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER " cd /opt/deployments/${params.BRANCH} - echo '========================================' - echo 'Step 1: Checking current state...' - echo '========================================' + echo '1. Остановка старого приложения...' + docker stop app-backend 2>/dev/null || echo 'Контейнер не найден' + docker rm app-backend 2>/dev/null || echo 'Контейнер не найден' - docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}' + echo '2. Удаление старых образов...' + docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления' - echo '========================================' - echo 'Step 2: Setup environment for compatibility...' - echo '========================================' + echo '3. Создание сети если нужно...' + docker network create app-network 2>/dev/null || echo 'Сеть уже существует' - docker network create app-network 2>/dev/null || echo 'Network app-network already exists' + echo '4. Запуск инфраструктуры...' + docker-compose up -d db storage - echo 'COMPOSE_COMPATIBILITY=true' > .env + echo '5. Ожидание PostgreSQL...' + sleep 10 - echo '========================================' - echo 'Step 3: Force cleanup old application...' - echo '========================================' + echo '6. Сборка нового образа приложения...' + docker build --no-cache -t app-backend:latest . - docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack' + echo '7. Запуск приложения...' + docker run -d \\ + --name app-backend \\ + --network app-network \\ + --network-alias app \\ + -p 80:8080 \\ + -v uploads_data:/data/uploads:rw \\ + -e POSTGRES_DB=no_copy_ \\ + -e POSTGRES_USER=postgres \\ + -e POSTGRES_PASSWORD=postgres \\ + -e POSTGRES_PORT=5432 \\ + -e POSTGRES_HOST=db \\ + --restart unless-stopped \\ + app-backend:latest - docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove' + echo '8. Запуск мониторинга...' + docker-compose up -d grafana prometheus loki tempo alloy - echo '========================================' - echo 'Step 4: Verify files and fix compose...' - echo '========================================' + echo '9. Проверка...' + sleep 5 - if [ ! -f docker-compose.yaml ]; then - echo 'ERROR: docker-compose.yaml not found!' - ls -la - exit 1 - fi + echo 'Статус контейнеров:' + docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}' - echo 'Checking docker-compose.yaml syntax...' - docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output' - - echo '========================================' - echo 'Step 5: Start infrastructure services...' - echo '========================================' - - echo 'Starting PostgreSQL with resource limits...' - docker-compose --compatibility up -d db - - echo 'Starting storage service...' - docker-compose --compatibility up -d storage - - echo 'Waiting for PostgreSQL to be ready...' - for i in {1..30}; do - if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then - echo 'PostgreSQL is ready' - break - fi - echo 'Waiting... attempt ' \$i - sleep 2 - done - - echo '========================================' - echo 'Step 6: Build application image...' - echo '========================================' - - if [ ! -f Dockerfile ]; then - echo 'ERROR: Dockerfile not found!' - exit 1 - fi - - echo 'Building Docker image...' - docker build --no-cache -t app-backend:latest . 2>&1 | tail -30 - - echo 'Image created successfully' - docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}' - - echo '========================================' - echo 'Step 7: Start application with resource limits...' - echo '========================================' - - docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists' - - echo 'Starting main application...' - docker-compose --compatibility up -d app - - echo 'Waiting for application to start...' - sleep 15 - - echo '========================================' - echo 'Step 8: Start monitoring stack...' - echo '========================================' - - docker-compose --compatibility up -d grafana prometheus loki tempo alloy - - echo '========================================' - echo 'Step 9: Verify deployment...' - echo '========================================' - - echo 'All containers status:' - docker-compose --compatibility ps - - echo '' - echo 'Resource limits check:' - echo 'App backend limits:' - docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect' - - echo '' - echo 'PostgreSQL limits:' - docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect' - - echo '' - echo 'Container resource usage:' - docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available' - - echo '========================================' - echo 'Step 10: Health checks...' - echo '========================================' - - echo 'Application health check...' - for i in {1..10}; do - if curl -s -f http://localhost:80/health 2>/dev/null; then - echo '✓ Application health check PASSED' - break - elif [ \$i -eq 10 ]; then - echo '✗ Application health check FAILED' - echo 'Last logs:' - docker-compose --compatibility logs --tail=20 app - else - echo 'Waiting for application... attempt ' \$i - sleep 5 - fi - done - - echo 'Checking monitoring services...' - if curl -s -f http://localhost:3000/api/health 2>/dev/null; then - echo '✓ Grafana is healthy' + echo '10. Проверка health...' + if curl -s -f http://localhost:80/health > /dev/null 2>&1; then + echo 'Приложение работает' + echo 'URL: http://${params.SERVER}:80' else - echo '⚠ Grafana may be starting' + echo 'Проверка health не удалась' + docker logs app-backend --tail=20 fi - - if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then - echo '✓ Prometheus is healthy' - fi - - echo '========================================' - echo 'Deployment Summary:' - echo '========================================' - echo 'Application URL: http://${params.SERVER}:80' - echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)' - echo 'Prometheus: http://${params.SERVER}:9090' - echo 'Loki: http://${params.SERVER}:3100' - echo '' - echo 'To view logs: docker-compose logs -f app' - echo 'To view all containers: docker-compose ps' - echo 'To stop: docker-compose down' - echo '========================================' " """ } @@ -213,8 +113,6 @@ pipeline { success { echo "Deployment successful" echo "Application URL: http://${params.SERVER}:80" - echo "Grafana: http://${params.SERVER}:3000" - echo "Prometheus: http://${params.SERVER}:9090" } failure { echo "Deployment failed for branch ${params.BRANCH}" diff --git a/src/main/java/ru/soune/nocopy/entity/file/FileType.java b/src/main/java/ru/soune/nocopy/entity/file/FileType.java index 82f1ebc..8844013 100644 --- a/src/main/java/ru/soune/nocopy/entity/file/FileType.java +++ b/src/main/java/ru/soune/nocopy/entity/file/FileType.java @@ -7,7 +7,7 @@ import java.util.List; @Getter public enum FileType { - IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp")), + IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")), VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg", "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")), AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));