Speed up Drone pipeline

.drone.yml

@@ -1,13 +1,13 @@
-kind: pipeline
+kind: pipeline
 type: docker
-name: checks
+name: code-quality
 
 trigger:
   event:
     - pull_request
 
 steps:
-  - name: backend-syntax
+  - name: backend-sanity
     image: python:3.11-slim
     commands:
       - cd backend
@@ -26,6 +26,10 @@ type: docker
 name: build-images
 
 trigger:
+  branch:
+    - main
+    - master
+    - develop
   event:
     - push
     - tag
@@ -36,14 +40,14 @@ steps:
     settings:
       registry: registry.nevetime.ru
       repo: registry.nevetime.ru/mc-panel-backend
-      context: backend
+      cache_from:
-      dockerfile: Dockerfile
+        - registry.nevetime.ru/mc-panel-backend:latest
       tags:
         - latest
         - ${DRONE_BUILD_NUMBER}
       auto_tag: true
-      cache_from:
+      dockerfile: backend/Dockerfile
-        - registry.nevetime.ru/mc-panel-backend:latest
+      context: backend
       username:
         from_secret: docker_username
       password:
@@ -54,14 +58,14 @@ steps:
     settings:
       registry: registry.nevetime.ru
       repo: registry.nevetime.ru/mc-panel-frontend
-      context: frontend
+      cache_from:
-      dockerfile: Dockerfile
+        - registry.nevetime.ru/mc-panel-frontend:latest
       tags:
         - latest
         - ${DRONE_BUILD_NUMBER}
       auto_tag: true
-      cache_from:
+      dockerfile: frontend/Dockerfile
-        - registry.nevetime.ru/mc-panel-frontend:latest
+      context: frontend
       username:
         from_secret: docker_username
       password:

backend/Dockerfile

@@ -1,30 +1,79 @@
-FROM python:3.11-slim
+# ================================
+# MC Panel Backend - Production Dockerfile
+# ================================
 
+FROM python:3.11-slim AS production
+
+# Метаданные
+LABEL maintainer="MC Panel Team" \
+      version="2.0.0" \
+      description="MC Panel Backend - FastAPI Server" \
+      component="backend"
+
+# Переменные окружения
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
     PYTHONPATH=/app \
     PORT=8000 \
-    WORKERS=2
+    WORKERS=1 \
+    DEBIAN_FRONTEND=noninteractive
 
+# Устанавливаем системные зависимости
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    procps \
+    ca-certificates \
+    tini \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
+# Создаем пользователя для безопасности
+RUN groupadd -r -g 1000 mcpanel && \
+    useradd -r -u 1000 -g mcpanel -d /app -s /bin/bash mcpanel
+
+# Создаем рабочую директорию
 WORKDIR /app
 
-RUN apt-get update \
+# Копируем requirements и устанавливаем зависимости
-    && apt-get install -y --no-install-recommends curl \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY requirements.txt ./
-RUN pip install --no-cache-dir --upgrade pip \
+RUN pip install --no-cache-dir --upgrade pip && \
-    && pip install --no-cache-dir -r requirements.txt
+    pip install --no-cache-dir -r requirements.txt
 
-COPY . ./
+# Копируем исходный код
+COPY --chown=mcpanel:mcpanel . ./
 
-RUN mkdir -p /app/servers /app/data /app/logs \
+# Создаем необходимые директории
-    && ([ -f /app/users.json ] || echo '{}' > /app/users.json) \
+RUN mkdir -p \
-    && ([ -f /app/tickets.json ] || echo '{}' > /app/tickets.json)
+    servers \
+    data \
+    logs \
+    && touch users.json tickets.json
 
+# Создаем конфигурационные файлы по умолчанию если их нет
+RUN [ ! -f users.json ] && echo '{}' > users.json || true && \
+    [ ! -f tickets.json ] && echo '{}' > tickets.json || true
+
+# Устанавливаем права доступа
+RUN chown -R mcpanel:mcpanel /app && \
+    chmod -R 755 /app && \
+    chmod +x main.py
+
+# Переключаемся на непривилегированного пользователя
+USER mcpanel
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
+    CMD curl -f http://localhost:${PORT}/health 2>/dev/null || \
+        curl -f http://localhost:${PORT}/ 2>/dev/null || exit 1
+
+# Expose порт
 EXPOSE 8000
 
-HEALTHCHECK --interval=30s --timeout=10s --start-period=20s --retries=3 \
+# Volumes для персистентных данных
-  CMD curl -fsS "http://localhost:${PORT}/health" || exit 1
+VOLUME ["/app/servers", "/app/data", "/app/logs"]
 
-CMD ["sh", "-c", "uvicorn main:app --host 0.0.0.0 --port ${PORT:-8000} --workers ${WORKERS:-2}"]
+# Используем tini как init процесс
+ENTRYPOINT ["/usr/bin/tini", "--"]
+
+# Команда запуска
+CMD ["sh", "-c", "python -m uvicorn main:app --host 0.0.0.0 --port ${PORT} --workers ${WORKERS}"]

deploy/docker-compose.hosting.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.8'
 
 services:
   backend:
@@ -10,17 +10,20 @@ services:
     environment:
       PORT: 8000
       WORKERS: 2
+      PYTHONPATH: /app
+      DEBUG: 'false'
     volumes:
       - mc_servers:/app/servers
       - mc_data:/app/data
       - mc_logs:/app/logs
     networks:
-      - mc-panel
+      - mc-panel-network
     healthcheck:
-      test: ["CMD", "curl", "-fsS", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
       interval: 30s
       timeout: 10s
       retries: 3
+      start_period: 60s
 
   frontend:
     image: ${FRONTEND_IMAGE:-registry.nevetime.ru/mc-panel-frontend:${IMAGE_TAG:-latest}}
@@ -32,18 +35,22 @@ services:
       backend:
         condition: service_healthy
     networks:
-      - mc-panel
+      - mc-panel-network
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost/health"]
+      test: ["CMD", "curl", "-f", "http://localhost/health"]
       interval: 30s
       timeout: 10s
       retries: 3
+      start_period: 30s
 
 volumes:
   mc_servers:
+    driver: local
   mc_data:
+    driver: local
   mc_logs:
+    driver: local
 
 networks:
-  mc-panel:
+  mc-panel-network:
     driver: bridge

docker-compose.dev.yml

@@ -1,47 +1,60 @@
-version: '3.8'
+version: '3.8'
 
 services:
-  backend:
+  # Backend для разработки
+  backend-dev:
     build:
       context: ./backend
       dockerfile: Dockerfile
+      target: production
     container_name: mc-panel-backend-dev
     restart: unless-stopped
     ports:
       - "8000:8000"
-    env_file:
-      - ./backend/.env
     environment:
-      PORT: 8000
+      - PORT=8000
-      WORKERS: 1
+      - WORKERS=1
+      - PYTHONPATH=/app
+      - DEBUG=true
+      - LOG_LEVEL=DEBUG
     volumes:
+      # Монтируем исходный код для hot reload
       - ./backend:/app
       - mc_servers_dev:/app/servers
       - mc_data_dev:/app/data
       - mc_logs_dev:/app/logs
-    command: ["sh", "-c", "uvicorn main:app --host 0.0.0.0 --port 8000 --reload"]
     networks:
       - mc-panel-dev
+    command: ["python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
 
-  frontend:
+  # Frontend для разработки
+  frontend-dev:
     build:
       context: ./frontend
       dockerfile: Dockerfile
-      args:
+      target: development
-        VITE_API_URL: http://localhost:8000
     container_name: mc-panel-frontend-dev
     restart: unless-stopped
     ports:
-      - "3000:80"
+      - "5173:5173"
-    depends_on:
+    volumes:
-      - backend
+      # Монтируем исходный код для hot reload
+      - ./frontend:/app
+      - /app/node_modules
     networks:
       - mc-panel-dev
+    environment:
+      - VITE_API_URL=http://localhost:8000
+    depends_on:
+      - backend-dev
 
 volumes:
   mc_servers_dev:
+    driver: local
   mc_data_dev:
+    driver: local
   mc_logs_dev:
+    driver: local
 
 networks:
   mc-panel-dev:

docker-compose.yml

@@ -1,49 +1,59 @@
-version: '3.8'
+version: '3.8'
 
 services:
+  # Backend сервис
   backend:
-    image: ${BACKEND_IMAGE:-registry.nevetime.ru/mc-panel-backend:${IMAGE_TAG:-latest}}
+    image: registry.nevetime.ru/mc-panel-backend:${IMAGE_TAG:-latest}
     container_name: mc-panel-backend
     restart: unless-stopped
+    ports:
+      - "8000:8000"
+    environment:
+      - PORT=8000
+      - WORKERS=2
+      - PYTHONPATH=/app
+      - DEBUG=false
     env_file:
       - ./backend/.env
-    environment:
-      PORT: ${BACKEND_PORT:-8000}
-      WORKERS: ${BACKEND_WORKERS:-2}
     volumes:
       - mc_servers:/app/servers
       - mc_data:/app/data
       - mc_logs:/app/logs
     networks:
-      - mc-panel
+      - mc-panel-network
     healthcheck:
-      test: ["CMD", "curl", "-fsS", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
       interval: 30s
       timeout: 10s
       retries: 3
+      start_period: 60s
 
+  # Frontend сервис
   frontend:
-    image: ${FRONTEND_IMAGE:-registry.nevetime.ru/mc-panel-frontend:${IMAGE_TAG:-latest}}
+    image: registry.nevetime.ru/mc-panel-frontend:${IMAGE_TAG:-latest}
     container_name: mc-panel-frontend
     restart: unless-stopped
     ports:
-      - "${FRONTEND_PORT:-80}:80"
+      - "80:80"
     depends_on:
-      backend:
+      - backend
-        condition: service_healthy
     networks:
-      - mc-panel
+      - mc-panel-network
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost/health"]
+      test: ["CMD", "curl", "-f", "http://localhost/health"]
       interval: 30s
       timeout: 10s
       retries: 3
+      start_period: 30s
 
 volumes:
   mc_servers:
+    driver: local
   mc_data:
+    driver: local
   mc_logs:
+    driver: local
 
 networks:
-  mc-panel:
+  mc-panel-network:
     driver: bridge

frontend/Dockerfile

@@ -1,25 +1,207 @@
-FROM node:20-alpine AS build
+# ================================
+# MC Panel Frontend - Multi-Stage Dockerfile
+# ================================
 
+# Stage 1: Build Stage
+FROM node:20-alpine AS builder
+
+# Метаданные
+LABEL maintainer="MC Panel Team" \
+      version="2.0.0" \
+      description="MC Panel Frontend - React Build Stage" \
+      component="frontend"
+
+# Устанавливаем зависимости для сборки
+RUN apk add --no-cache git python3 make g++
+
+# Создаем рабочую директорию
 WORKDIR /app
 
+# Копируем package files для кеширования зависимостей
 COPY package*.json ./
+
+# Устанавливаем зависимости
 RUN npm ci --silent
 
+# Копируем исходный код
 COPY . ./
 
-ARG VITE_API_URL=
+# Собираем приложение для production
-ENV VITE_API_URL=${VITE_API_URL}
-
 RUN npm run build
 
-FROM nginx:1.27-alpine
+# Проверяем размер сборки
+RUN du -sh dist/ && \
+    echo "Build completed successfully"
 
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+# ================================
-COPY --from=build /app/dist /usr/share/nginx/html
+# Stage 2: Production Stage (Nginx)
+# ================================
+FROM nginx:alpine AS production
 
+# Метаданные
+LABEL maintainer="MC Panel Team" \
+      version="2.0.0" \
+      description="MC Panel Frontend - Nginx Production Server" \
+      component="frontend"
+
+# Устанавливаем дополнительные пакеты
+RUN apk add --no-cache curl tini
+
+# Создаем пользователя nginx если его нет
+RUN addgroup -g 1000 -S mcpanel && \
+    adduser -u 1000 -D -S -G mcpanel mcpanel
+
+# Копируем собранное приложение из builder stage
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Создаем кастомную конфигурацию Nginx
+RUN cat > /etc/nginx/conf.d/default.conf << 'EOF'
+server {
+    listen 80;
+    listen [::]:80;
+    server_name _;
+    
+    root /usr/share/nginx/html;
+    index index.html;
+    
+    # Gzip compression
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json;
+    
+    # Security headers
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+    add_header Referrer-Policy "no-referrer-when-downgrade" always;
+    
+    # Cache static assets
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+    
+    # Handle React Router (SPA)
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+    
+    # API proxy (если нужно)
+    location /api/ {
+        proxy_pass http://backend:8000/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+    
+    # WebSocket proxy (если нужно)
+    location /ws/ {
+        proxy_pass http://backend:8000/ws/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+    
+    # Health check endpoint
+    location /health {
+        access_log off;
+        return 200 "healthy\n";
+        add_header Content-Type text/plain;
+    }
+}
+EOF
+
+# Создаем кастомную конфигурацию nginx.conf
+RUN cat > /etc/nginx/nginx.conf << 'EOF'
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log notice;
+pid /var/run/nginx.pid;
+
+events {
+    worker_connections 1024;
+    use epoll;
+    multi_accept on;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+    
+    access_log /var/log/nginx/access.log main;
+    
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    client_max_body_size 100M;
+    
+    include /etc/nginx/conf.d/*.conf;
+}
+EOF
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
+    CMD curl -f http://localhost/health || exit 1
+
+# Expose порт
 EXPOSE 80
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
+# Используем tini как init процесс
-  CMD wget -qO- http://localhost/health >/dev/null || exit 1
+ENTRYPOINT ["/sbin/tini", "--"]
 
+# Команда запуска
 CMD ["nginx", "-g", "daemon off;"]
+
+# ================================
+# Stage 3: Development Stage
+# ================================
+FROM node:20-alpine AS development
+
+# Метаданные
+LABEL maintainer="MC Panel Team" \
+      version="2.0.0" \
+      description="MC Panel Frontend - Development Server" \
+      component="frontend"
+
+# Устанавливаем зависимости для разработки
+RUN apk add --no-cache git python3 make g++
+
+# Создаем пользователя для разработки
+RUN addgroup -g 1000 -S mcpanel && \
+    adduser -u 1000 -D -S -G mcpanel mcpanel
+
+# Создаем рабочую директорию
+WORKDIR /app
+
+# Меняем владельца директории
+RUN chown mcpanel:mcpanel /app
+
+# Переключаемся на пользователя
+USER mcpanel
+
+# Копируем package files
+COPY --chown=mcpanel:mcpanel package*.json ./
+
+# Устанавливаем зависимости
+RUN npm ci
+
+# Копируем исходный код
+COPY --chown=mcpanel:mcpanel . ./
+
+# Expose порт для dev сервера
+EXPOSE 5173
+
+# Команда для разработки
+CMD ["npm", "run", "dev"]

frontend/nginx.conf

@@ -1,37 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-
-    root /usr/share/nginx/html;
-    index index.html;
-
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    location /api/ {
-        proxy_pass http://backend:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /ws/ {
-        proxy_pass http://backend:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location = /health {
-        access_log off;
-        return 200 'ok';
-        add_header Content-Type text/plain;
-    }
-}