Compare commits
7
Commits
NCBACK-6
...
d896f23872
| Author | SHA1 | Date | |
|---|---|---|---|
 vladp
|
d896f23872 | ||
|
vladp
|
63baaf7c80 | ||
|
vladp
|
3a9a5b48a2 | ||
|
vladp
|
6fff5884d2 | ||
|
vladp
|
f8673dd581 | ||
|
vladp
|
b9a401f113 | ||
|
vladp
|
918b4894fc |
+5
-4
@@ -58,7 +58,8 @@ services:
|
||||
environment:
|
||||
FILE_STORAGE_PATH: /data/uploads
|
||||
MAX_FILE_SIZE: 10737418240
|
||||
FILE_CHUNK_SIZE: 1048576
|
||||
# FILE_CHUNK_SIZE: 1048576
|
||||
FILE_CHUNK_SIZE: 1000000
|
||||
POSTGRES_DB: no_copy_
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
@@ -120,7 +121,7 @@ services:
|
||||
prometheus:
|
||||
image: prom/prometheus:latest
|
||||
container_name: prometheus
|
||||
deploy: # ← ДОБАВЛЕНО
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.5'
|
||||
@@ -148,7 +149,7 @@ services:
|
||||
loki:
|
||||
image: grafana/loki:2.9.2
|
||||
container_name: loki
|
||||
deploy: # ← ДОБАВЛЕНО
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '1.0'
|
||||
@@ -173,7 +174,7 @@ services:
|
||||
tempo:
|
||||
image: grafana/tempo:2.4.1
|
||||
container_name: tempo
|
||||
deploy: # ← ДОБАВЛЕНО
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.5'
|
||||
|
||||
@@ -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 '========================================'
|
||||
|
||||
if [ ! -f docker-compose.yaml ]; then
|
||||
echo 'ERROR: docker-compose.yaml not found!'
|
||||
ls -la
|
||||
exit 1
|
||||
fi
|
||||
|
||||
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
|
||||
echo '9. Проверка...'
|
||||
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 'Статус контейнеров:'
|
||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||
|
||||
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}"
|
||||
|
||||
@@ -368,18 +368,6 @@ public class ApiController {
|
||||
return contentType;
|
||||
}
|
||||
|
||||
private boolean isPreviewSupported(String mimeType) {
|
||||
if (mimeType == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mimeType.startsWith("image") ||
|
||||
mimeType.startsWith("text") ||
|
||||
mimeType.equals("pdf") ||
|
||||
mimeType.startsWith("video") ||
|
||||
mimeType.startsWith("audio");
|
||||
}
|
||||
|
||||
private Long getUserIdFromToken(String tokenHeader) {
|
||||
String token = tokenHeader.replace("Bearer ", "");
|
||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||
|
||||
@@ -7,21 +7,10 @@ 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")),
|
||||
DOCUMENT("document", Arrays.asList(
|
||||
"pdf", "txt", "rtf",
|
||||
"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pps", "ppsx", "dot", "dotx", "xlt", "xltx", "pot", "potx",
|
||||
"odt", "ods", "odp", "odg", "odf", "odb", "odc", "odi", "odm", "ott", "ots", "otp", "otg", "oth",
|
||||
"sxw", "sxc", "sxi", "sxd", "sxg", "stc", "sti", "stw", "sxm",
|
||||
"pages", "numbers", "key",
|
||||
"csv", "tsv", "xml", "html", "htm", "tex", "md", "markdown",
|
||||
"epub", "mobi", "azw", "azw3", "fb2",
|
||||
"wps", "wpt", "et", "dps", "vsd", "vsdx",
|
||||
"java", "py", "cpp", "c", "h", "js", "css", "php", "sql", "json", "yaml", "yml", "sh", "bat",
|
||||
"one", "note"));
|
||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
||||
|
||||
private final String displayName;
|
||||
private final List<String> allowedExtensions;
|
||||
|
||||
@@ -9,7 +9,6 @@ import ru.soune.nocopy.dto.file.*;
|
||||
import ru.soune.nocopy.entity.AuthToken;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.entity.file.FileType;
|
||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
@@ -63,7 +62,8 @@ public class FileEntityHandler implements RequestHandler {
|
||||
.action(action)
|
||||
.availableActions(Arrays.asList(
|
||||
"file_info", "file_by_session", "user_files",
|
||||
"search_files", "storage_usage", "delete_file"))
|
||||
"search_files", "storage_usage", "delete_file",
|
||||
"user_files_info"))
|
||||
.build();
|
||||
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
|
||||
@@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService {
|
||||
int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
|
||||
log.debug("File will be split into {} chunks (chunk size: {} bytes)",
|
||||
totalChunks, chunkSize);
|
||||
Long chunkSize = totalChunks == 1 ? fileSize : 1048576L;
|
||||
Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
|
||||
|
||||
FileUploadSession session = FileUploadSession.builder()
|
||||
.userId(userId)
|
||||
|
||||
@@ -25,7 +25,8 @@ file:
|
||||
storage:
|
||||
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
||||
# chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB
|
||||
chunk-size: ${FILE_CHUNK_SIZE:1048576} # 15MB
|
||||
# chunk-size: ${FILE_CHUNK_SIZE:1048576} # 1MB
|
||||
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
||||
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
||||
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||
|
||||
Reference in New Issue
Block a user