Rebuild Docker, Compose and Drone CI configuration

.drone.yml

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

backend/Dockerfile

@@ -1,79 +1,30 @@
-# ================================
+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=1 \
+    WORKERS=2
-    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
 
-# Копируем requirements и устанавливаем зависимости
+RUN apt-get update \
+    && 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 \
-RUN mkdir -p \
+    && ([ -f /app/users.json ] || echo '{}' > /app/users.json) \
-    servers \
+    && ([ -f /app/tickets.json ] || echo '{}' > /app/tickets.json)
-    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
 
-# Volumes для персистентных данных
+HEALTHCHECK --interval=30s --timeout=10s --start-period=20s --retries=3 \
-VOLUME ["/app/servers", "/app/data", "/app/logs"]
+  CMD curl -fsS "http://localhost:${PORT}/health" || exit 1
 
-# Используем tini как init процесс
+CMD ["sh", "-c", "uvicorn main:app --host 0.0.0.0 --port ${PORT:-8000} --workers ${WORKERS:-2}"]
-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,20 +10,17 @@ 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-network
+      - mc-panel
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-fsS", "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}}
@@ -35,22 +32,18 @@ services:
       backend:
         condition: service_healthy
     networks:
-      - mc-panel-network
+      - mc-panel
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      test: ["CMD", "wget", "-qO-", "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-network:
+  mc-panel:
     driver: bridge

docker-compose.dev.yml

@@ -1,61 +1,48 @@
-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
-      target: development
+      args:
+        VITE_API_URL: http://localhost:8000
     container_name: mc-panel-frontend-dev
     restart: unless-stopped
     ports:
-      - "5173:5173"
+      - "3000:80"
-    volumes:
+    depends_on:
-      # Монтируем исходный код для hot reload
+      - backend
-      - ./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:
-    driver: bridge
+    driver: bridge

docker-compose.yml

@@ -1,59 +1,49 @@
-version: '3.8'
+version: '3.8'
 
 services:
-  # Backend сервис
   backend:
-    image: registry.nevetime.ru/mc-panel-backend:${IMAGE_TAG:-latest}
+    image: ${BACKEND_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-network
+      - mc-panel
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-fsS", "http://localhost:8000/health"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 60s
 
-  # Frontend сервис
   frontend:
-    image: registry.nevetime.ru/mc-panel-frontend:${IMAGE_TAG:-latest}
+    image: ${FRONTEND_IMAGE:-registry.nevetime.ru/mc-panel-frontend:${IMAGE_TAG:-latest}}
     container_name: mc-panel-frontend
     restart: unless-stopped
     ports:
-      - "80:80"
+      - "${FRONTEND_PORT:-80}:80"
     depends_on:
-      - backend
+      backend:
+        condition: service_healthy
     networks:
-      - mc-panel-network
+      - mc-panel
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      test: ["CMD", "wget", "-qO-", "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-network:
+  mc-panel:
-    driver: bridge
+    driver: bridge

frontend/Dockerfile

@@ -1,207 +1,25 @@
-# ================================
+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 . ./
 
-# Собираем приложение для production
+ARG VITE_API_URL=
+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
-# Stage 2: Production Stage (Nginx)
+COPY --from=build /app/dist /usr/share/nginx/html
-# ================================
-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
 
-# Используем tini как init процесс
+HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
-ENTRYPOINT ["/sbin/tini", "--"]
+  CMD wget -qO- http://localhost/health >/dev/null || exit 1
 
-# Команда запуска
 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

@@ -0,0 +1,37 @@
+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;
+    }
+}