fix: исправления и улучшения от 30.04.2026

- Обновлён backend/Dockerfile и frontend/Dockerfile - Исправлен async_ops.py (новые асинхронные операции) - Обновлён config.py - Исправлены compose.yml и compose.prod.yml - Обновлён deploy.sh - Переименованы nginx-конфиги (serverpanel → pvemanager) - Улучшены InstanceActionDialogs, InstanceDetailPage, InstancesPage - Обновлён AppLayout.tsx - Исправлен init.sql - Обновлён frontend/nginx.conf и package.json
2026-04-30 21:58:44 +02:00
parent 79d6864d43
commit adcc86f30a
18 changed files with 403 additions and 153 deletions
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,66 +1,61 @@
-# Multi-stage build для минимального размера образа
-FROM python:3.12-alpine AS builder
+# syntax=docker/dockerfile:1.7
+# Multi-stage build на python:3.12-slim (glibc) — wheels ставятся бинарно,
+# никакого rust/cargo не требуется → сборка в разы быстрее.
+FROM python:3.12-slim AS builder

-# Set environment variables
 ENV PYTHONUNBUFFERED=1 \
-    PIP_NO_CACHE_DIR=1 \
    PIP_DISABLE_PIP_VERSION_CHECK=1 \
    PYTHONDONTWRITEBYTECODE=1

 WORKDIR /app

-# Install build dependencies
-RUN apk add --no-cache --virtual .build-deps \
-    gcc \
-    musl-dev \
-    postgresql-dev \
-    libffi-dev \
-    openssl-dev \
-    cargo \
-    rust
+# Минимальные build-зависимости (на случай если какой-то пакет придётся компилировать)
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        libpq-dev \
+    && rm -rf /var/lib/apt/lists/*

-# Copy and install Python dependencies
 COPY requirements.txt .
-RUN pip install --user --no-warn-script-location -r requirements.txt

-# Final stage - минимальный образ
-FROM python:3.12-alpine
+# BuildKit-кеш для pip — повторные сборки почти мгновенные
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install --user --no-warn-script-location -r requirements.txt
+
+# ---------- Финальный образ ----------
+FROM python:3.12-slim

 ENV PYTHONUNBUFFERED=1 \
    PYTHONDONTWRITEBYTECODE=1 \
    PYTHONPATH=/app \
-    PATH=/root/.local/bin:$PATH
+    PATH=/root/.local/bin:$PATH \
+    TZ=Asia/Tashkent

 WORKDIR /app

-# Install only runtime dependencies
-RUN apk add --no-cache \
-    libpq \
-    openssh-client \
-    curl \
-    git \
-    docker-cli \
-    docker-compose \
-    libstdc++ \
-    tzdata \
+# Только runtime-зависимости. docker.io даёт CLI `docker` для self-update через сокет.
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libpq5 \
+        openssh-client \
+        curl \
+        git \
+        docker.io \
+        tzdata \
+        ca-certificates \
+    && rm -rf /var/lib/apt/lists/* \
    && mkdir -p /root/.ssh /app/logs \
-    && cp /usr/share/zoneinfo/Asia/Tashkent /etc/localtime \
+    && ln -fs /usr/share/zoneinfo/Asia/Tashkent /etc/localtime \
    && echo "Asia/Tashkent" > /etc/timezone \
    && git config --global --add safe.directory /project

-# Copy Python dependencies from builder
 COPY --from=builder /root/.local /root/.local

-# Copy application code
 COPY app ./app
 COPY migrations ./migrations
 COPY init_admin.py .

-# Health check с быстрой проверкой
-HEALTHCHECK --interval=15s --timeout=3s --start-period=10s --retries=2 \
-    CMD curl -f http://localhost:8000/health || exit 1
+HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=5 \
+    CMD curl -fs http://localhost:8000/health || exit 1

 EXPOSE 8000

-# Оптимизированный запуск с preload для быстрого старта
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "1", "--limit-concurrency", "100", "--timeout-keep-alive", "30"]
--- a/backend/app/api/proxmox/async_ops.py
+++ b/backend/app/api/proxmox/async_ops.py
@@ -162,6 +162,67 @@ def _do_reinstall_sync(task_id: int, server_id: int, vmid: int, node: str,
        except Exception as _ce:
            logger.warning(f"[REINSTALL #{task_id}] re-apply config failed: {_ce}")

+        # 5) Restore disk size
+        disk_size_bytes = cached.disk_size
+        if disk_size_bytes and disk_size_bytes > 0:
+            _update_deploy_task(task_id, 'running', 'Восстановление размера диска...', 92, vmid=vmid, node=node)
+            try:
+                disk_size_gb = disk_size_bytes // (1024 ** 3)
+                if is_lxc:
+                    lxc_cfg = client.get_container_config(node, vmid)
+                    current_size_gb = 0
+                    if lxc_cfg and 'rootfs' in lxc_cfg:
+                        rootfs_val = lxc_cfg['rootfs']
+                        if 'size=' in rootfs_val:
+                            size_part = rootfs_val.split('size=')[1].split(',')[0]
+                            if size_part.endswith('G'):
+                                current_size_gb = int(size_part[:-1])
+                            elif size_part.endswith('M'):
+                                current_size_gb = int(size_part[:-1]) // 1024
+                    if disk_size_gb > current_size_gb:
+                        client.resize_container_disk(node, vmid, 'rootfs', f'{disk_size_gb}G')
+                        logger.info(f"[REINSTALL #{task_id}] LXC {vmid} rootfs resized from {current_size_gb}G to {disk_size_gb}G")
+                    else:
+                        logger.info(f"[REINSTALL #{task_id}] LXC {vmid} rootfs already {current_size_gb}G >= {disk_size_gb}G, skip resize")
+                else:
+                    vm_cfg = client.get_vm_config(node, vmid)
+                    disk_key = None
+                    current_size_gb = 0
+                    if vm_cfg:
+                        for key in ['scsi0', 'virtio0', 'sata0', 'scsi1', 'virtio1']:
+                            if key in vm_cfg:
+                                disk_val = vm_cfg[key]
+                                if 'cdrom' in disk_val.lower() or 'cloudinit' in disk_val.lower() or 'media=cdrom' in disk_val.lower():
+                                    continue
+                                disk_key = key
+                                if 'size=' in disk_val:
+                                    size_part = disk_val.split('size=')[1].split(',')[0]
+                                    if size_part.endswith('G'):
+                                        current_size_gb = int(size_part[:-1])
+                                    elif size_part.endswith('M'):
+                                        current_size_gb = int(size_part[:-1]) // 1024
+                                break
+                    if disk_key and disk_size_gb > current_size_gb:
+                        client.resize_vm_disk(node, vmid, disk_key, f'{disk_size_gb}G')
+                        logger.info(f"[REINSTALL #{task_id}] VM {vmid} {disk_key} resized from {current_size_gb}G to {disk_size_gb}G")
+                    elif disk_key:
+                        logger.info(f"[REINSTALL #{task_id}] VM {vmid} {disk_key} already {current_size_gb}G >= {disk_size_gb}G, skip resize")
+                    else:
+                        logger.warning(f"[REINSTALL #{task_id}] VM {vmid} no main disk found for resize")
+            except Exception as _re:
+                logger.warning(f"[REINSTALL #{task_id}] disk resize failed: {_re}")
+
+        # 6) Start VM/LXC
+        _update_deploy_task(task_id, 'running', 'Запуск инстанса...', 96, vmid=vmid, node=node)
+        try:
+            if is_lxc:
+                client.start_container(node, vmid)
+            else:
+                client.start_vm(node, vmid)
+            logger.info(f"[REINSTALL #{task_id}] vmid={vmid} started after reinstall")
+        except Exception as _se:
+            logger.warning(f"[REINSTALL #{task_id}] start after reinstall failed: {_se}")
+
        LoggingService.log_proxmox_action(
            db=db, action='reinstall',
            resource_type='lxc' if is_lxc else 'vm', resource_id=vmid,
--- a/backend/app/config.py
+++ b/backend/app/config.py
@@ -28,9 +28,9 @@ class Settings(BaseSettings):
    # Database settings
    DB_HOST: str = Field(default="localhost", env="DB_HOST")
    DB_PORT: int = Field(default=5432, env="DB_PORT")
-    DB_USER: str = Field(default="serverpanel", env="DB_USER")
-    DB_PASSWORD: str = Field(default="serverpanel", env="DB_PASSWORD")
-    DB_NAME: str = Field(default="serverpanel", env="DB_NAME")
+    DB_USER: str = Field(default="pvemanager", env="DB_USER")
+    DB_PASSWORD: str = Field(default="pvemanager", env="DB_PASSWORD")
+    DB_NAME: str = Field(default="pvemanager", env="DB_NAME")
    DATABASE_URL: Optional[str] = Field(default=None, env="DATABASE_URL")

    # Security settings