fixed dockerfile
Some checks failed
continuous-integration/drone/push Build encountered an error

This commit is contained in:
2026-01-18 19:59:20 +06:00
parent e7b2216c72
commit 5868c4014b

View File

@@ -1,59 +1,38 @@
# ================================
# MC Panel - Optimized Multi-Stage Dockerfile
# ================================
# Stage 1: Frontend Build
FROM node:20-alpine AS frontend-builder FROM node:20-alpine AS frontend-builder
# Установка зависимостей для сборки
RUN apk add --no-cache git python3 make g++ RUN apk add --no-cache git python3 make g++
WORKDIR /app/frontend WORKDIR /app/frontend
# Копируем package files для кеширования зависимостей
COPY frontend/package*.json ./ COPY frontend/package*.json ./
# Устанавливаем зависимости с оптимизацией
RUN npm ci --only=production --silent && \ RUN npm ci --only=production --silent && \
npm ci --silent npm ci --silent
# Копируем исходники и конфиги
COPY frontend/ ./ COPY frontend/ ./
# Собираем продакшн версию
RUN npm run build && \ RUN npm run build && \
npm prune --production npm prune --Production
# ================================
# Stage 2: Python Dependencies Builder
# ================================
FROM python:3.11-slim AS python-builder FROM python:3.11-slim AS python-builder
# Устанавливаем системные зависимости для компиляции
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
gcc \ gcc \
g++ \ g++ \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Создаем виртуальное окружение
RUN python -m venv /opt/venv RUN python -m venv /opt/venv
ENV PATH="/opt/venv/bin:$PATH" ENV PATH="/opt/venv/bin:$PATH"
# Обновляем pip и wheel
RUN pip install --no-cache-dir --upgrade pip wheel setuptools RUN pip install --no-cache-dir --upgrade pip wheel setuptools
# Устанавливаем backend зависимости
COPY backend/requirements.txt /tmp/backend-requirements.txt COPY backend/requirements.txt /tmp/backend-requirements.txt
RUN pip install --no-cache-dir -r /tmp/backend-requirements.txt RUN pip install --no-cache-dir -r /tmp/backend-requirements.txt
# Устанавливаем daemon зависимости
COPY daemon/requirements.txt /tmp/daemon-requirements.txt COPY daemon/requirements.txt /tmp/daemon-requirements.txt
RUN pip install --no-cache-dir -r /tmp/daemon-requirements.txt RUN pip install --no-cache-dir -r /tmp/daemon-requirements.txt
# ================================
# Stage 3: Production Runtime
# ================================
FROM python:3.11-slim AS production FROM python:3.11-slim AS production
# Метаданные # Метаданные
@@ -62,7 +41,6 @@ LABEL maintainer="MC Panel Team" \
description="MC Panel - Minecraft Server Management Panel" \ description="MC Panel - Minecraft Server Management Panel" \
org.opencontainers.image.source="https://github.com/your-repo/mc-panel" org.opencontainers.image.source="https://github.com/your-repo/mc-panel"
# Переменные окружения
ENV PYTHONDONTWRITEBYTECODE=1 \ ENV PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1 \ PYTHONUNBUFFERED=1 \
PYTHONPATH=/app \ PYTHONPATH=/app \
@@ -71,7 +49,6 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
WORKERS=1 \ WORKERS=1 \
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
# Устанавливаем только runtime зависимости
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl \ curl \
procps \ procps \
@@ -80,14 +57,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& apt-get clean && apt-get clean
# Создаем пользователя для безопасности
RUN groupadd -r -g 1000 mcpanel && \ RUN groupadd -r -g 1000 mcpanel && \
useradd -r -u 1000 -g mcpanel -d /app -s /bin/bash mcpanel useradd -r -u 1000 -g mcpanel -d /app -s /bin/bash mcpanel
# Копируем виртуальное окружение из builder stage
COPY --from=python-builder /opt/venv /opt/venv COPY --from=python-builder /opt/venv /opt/venv
# Создаем структуру директорий
WORKDIR /app WORKDIR /app
RUN mkdir -p \ RUN mkdir -p \
backend \ backend \
@@ -99,46 +73,33 @@ RUN mkdir -p \
backend/data \ backend/data \
&& touch backend/users.json backend/tickets.json && touch backend/users.json backend/tickets.json
# Копируем собранный frontend
COPY --from=frontend-builder /app/frontend/dist ./frontend/dist/ COPY --from=frontend-builder /app/frontend/dist ./frontend/dist/
# Копируем backend код
COPY --chown=mcpanel:mcpanel backend/ ./backend/ COPY --chown=mcpanel:mcpanel backend/ ./backend/
# Копируем daemon код
COPY --chown=mcpanel:mcpanel daemon/ ./daemon/ COPY --chown=mcpanel:mcpanel daemon/ ./daemon/
# Копируем дополнительные файлы
COPY --chown=mcpanel:mcpanel key.py ./ COPY --chown=mcpanel:mcpanel key.py ./
# Создаем конфигурационные файлы по умолчанию если их нет
RUN [ ! -f backend/users.json ] && echo '{}' > backend/users.json || true && \ RUN [ ! -f backend/users.json ] && echo '{}' > backend/users.json || true && \
[ ! -f backend/tickets.json ] && echo '{}' > backend/tickets.json || true [ ! -f backend/tickets.json ] && echo '{}' > backend/tickets.json || true
# Устанавливаем права доступа
RUN chown -R mcpanel:mcpanel /app && \ RUN chown -R mcpanel:mcpanel /app && \
chmod -R 755 /app && \ chmod -R 755 /app && \
chmod +x backend/main.py chmod +x backend/main.py
# Переключаемся на непривилегированного пользователя
USER mcpanel USER mcpanel
# Health check с улучшенной проверкой
HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \ HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
CMD curl -f http://localhost:${PORT}/health 2>/dev/null || \ CMD curl -f http://localhost:${PORT}/health 2>/dev/null || \
curl -f http://localhost:${PORT}/ 2>/dev/null || exit 1 curl -f http://localhost:${PORT}/ 2>/dev/null || exit 1
# Expose порты
EXPOSE 8000 EXPOSE 8000
# Volumes для персистентных данных
VOLUME ["/app/backend/servers", "/app/backend/data", "/app/logs"] VOLUME ["/app/backend/servers", "/app/backend/data", "/app/logs"]
# Рабочая директория для запуска
WORKDIR /app/backend WORKDIR /app/backend
# Используем tini как init процесс для правильной обработки сигналов
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--"]
# Команда запуска с переменными окружения
CMD ["sh", "-c", "python -m uvicorn main:app --host 0.0.0.0 --port ${PORT} --workers ${WORKERS}"] CMD ["sh", "-c", "python -m uvicorn main:app --host 0.0.0.0 --port ${PORT} --workers ${WORKERS}"]