Рефакторинг инфраструктуры и конфигурации проекта
- Перенесена структура Django-конфига в src/core и src/settings - Унифицирована Docker-сборка и docker-compose для dev/prod - Добавлены startup-checks (DB/Redis) и обновлены env-шаблоны - Расширена OpenAPI-документация и ответы API - Удалены устаревшие deploy/requirements/служебные скрипты - Обновлены CI/CD, README и тесты
This commit is contained in:
110
docker/Dockerfile
Normal file
110
docker/Dockerfile
Normal file
@@ -0,0 +1,110 @@
|
||||
FROM python:3.11-slim-bookworm AS base
|
||||
|
||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||
PYTHONUNBUFFERED=1 \
|
||||
UV_COMPILE_BYTECODE=1 \
|
||||
UV_LINK_MODE=copy \
|
||||
UV_PYTHON_DOWNLOADS=never \
|
||||
UV_PROJECT_ENVIRONMENT=/app/.venv
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN groupadd -r appgroup && useradd -r -g appgroup -m appuser
|
||||
|
||||
# Install uv binary.
|
||||
COPY --from=ghcr.io/astral-sh/uv:0.7.2 /uv /uvx /usr/local/bin/
|
||||
|
||||
|
||||
FROM base AS builder
|
||||
|
||||
ARG INSTALL_DEV=false
|
||||
|
||||
# hadolint ignore=DL3008
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
gcc \
|
||||
libpq-dev \
|
||||
libffi-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
zlib1g-dev \
|
||||
pkg-config \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY pyproject.toml uv.lock ./
|
||||
|
||||
RUN if [ "${INSTALL_DEV}" = "true" ]; then \
|
||||
uv sync --frozen --no-install-project --dev; \
|
||||
else \
|
||||
uv sync --frozen --no-install-project; \
|
||||
fi
|
||||
|
||||
|
||||
FROM base AS runtime-base
|
||||
|
||||
# hadolint ignore=DL3008
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
libpq5 \
|
||||
libffi8 \
|
||||
libxml2 \
|
||||
libxslt1.1 \
|
||||
zlib1g \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY --from=builder /app/.venv /app/.venv
|
||||
COPY src/ ./src/
|
||||
COPY docker/scripts/ ./docker/scripts/
|
||||
|
||||
RUN mkdir -p logs media staticfiles input/fns input/fns/processed input/fns/failed src/static \
|
||||
&& chmod +x /app/docker/scripts/*.sh \
|
||||
&& chown -R appuser:appgroup /app
|
||||
|
||||
ENV PATH="/app/.venv/bin:${PATH}" \
|
||||
PYTHONPATH=/app/src
|
||||
|
||||
USER appuser
|
||||
|
||||
|
||||
FROM runtime-base AS runtime-web
|
||||
|
||||
EXPOSE 8000
|
||||
CMD ["/app/docker/scripts/start-web.sh"]
|
||||
|
||||
|
||||
FROM runtime-base AS runtime-celery
|
||||
|
||||
USER root
|
||||
|
||||
# Playwright/Chromium runtime dependencies.
|
||||
# hadolint ignore=DL3008
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
libnss3 \
|
||||
libnspr4 \
|
||||
libatk1.0-0 \
|
||||
libatk-bridge2.0-0 \
|
||||
libcups2 \
|
||||
libdrm2 \
|
||||
libdbus-1-3 \
|
||||
libxkbcommon0 \
|
||||
libxcomposite1 \
|
||||
libxdamage1 \
|
||||
libxfixes3 \
|
||||
libxrandr2 \
|
||||
libgbm1 \
|
||||
libasound2 \
|
||||
libpango-1.0-0 \
|
||||
libcairo2 \
|
||||
libatspi2.0-0 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV PLAYWRIGHT_BROWSERS_PATH=/app/.playwright
|
||||
RUN python -m playwright install chromium \
|
||||
&& chown -R appuser:appgroup /app
|
||||
|
||||
USER appuser
|
||||
|
||||
CMD ["/app/docker/scripts/start-celery-worker.sh"]
|
||||
@@ -1,62 +0,0 @@
|
||||
FROM python:3.11.2-slim
|
||||
|
||||
# Установка системных зависимостей
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
gcc \
|
||||
libpq-dev \
|
||||
libffi-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
zlib1g-dev \
|
||||
# Зависимости для Playwright/Chromium
|
||||
libnss3 \
|
||||
libnspr4 \
|
||||
libatk1.0-0 \
|
||||
libatk-bridge2.0-0 \
|
||||
libcups2 \
|
||||
libdrm2 \
|
||||
libdbus-1-3 \
|
||||
libxkbcommon0 \
|
||||
libxcomposite1 \
|
||||
libxdamage1 \
|
||||
libxfixes3 \
|
||||
libxrandr2 \
|
||||
libgbm1 \
|
||||
libasound2 \
|
||||
libpango-1.0-0 \
|
||||
libcairo2 \
|
||||
libatspi2.0-0 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Создание рабочей директории
|
||||
WORKDIR /app
|
||||
|
||||
# Копирование файлов зависимостей
|
||||
COPY requirements.txt .
|
||||
COPY requirements-dev.txt .
|
||||
|
||||
# Установка Python зависимостей
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
RUN pip install --no-cache-dir -r requirements-dev.txt
|
||||
|
||||
# Копирование исходного кода
|
||||
COPY src/ ./src/
|
||||
|
||||
# Создание необходимых директорий
|
||||
RUN mkdir -p logs src/logs
|
||||
|
||||
# PYTHONPATH для доступа к модулям
|
||||
ENV PYTHONPATH=/app/src
|
||||
ENV DJANGO_SETTINGS_MODULE=config.settings.dev
|
||||
|
||||
# Создание пользователя для запуска приложения
|
||||
RUN groupadd -r appgroup && useradd -r -g appgroup appuser
|
||||
|
||||
# Установка Playwright браузеров для appuser
|
||||
ENV PLAYWRIGHT_BROWSERS_PATH=/app/.playwright
|
||||
RUN playwright install chromium --with-deps || true
|
||||
RUN chown -R appuser:appgroup /app
|
||||
USER appuser
|
||||
|
||||
# Команда по умолчанию будет передаваться из docker-compose
|
||||
@@ -1,45 +0,0 @@
|
||||
FROM python:3.11.2-slim
|
||||
|
||||
# Установка системных зависимостей
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
gcc \
|
||||
postgresql-client \
|
||||
libpq-dev \
|
||||
libffi-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
zlib1g-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Создание рабочей директории
|
||||
WORKDIR /app
|
||||
|
||||
# Копирование файлов зависимостей
|
||||
COPY requirements.txt .
|
||||
COPY requirements-dev.txt .
|
||||
|
||||
# Установка Python зависимостей
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
RUN pip install --no-cache-dir -r requirements-dev.txt
|
||||
|
||||
# Копирование исходного кода
|
||||
COPY src/ ./src/
|
||||
|
||||
# Создание необходимых директорий
|
||||
RUN mkdir -p logs staticfiles media src/logs src/static src/staticfiles src/media
|
||||
|
||||
# PYTHONPATH для доступа к модулям
|
||||
ENV PYTHONPATH=/app/src
|
||||
ENV DJANGO_SETTINGS_MODULE=config.settings.dev
|
||||
|
||||
# Создание пользователя для запуска приложения
|
||||
RUN groupadd -r appgroup && useradd -r -g appgroup appuser
|
||||
RUN chown -R appuser:appgroup /app
|
||||
USER appuser
|
||||
|
||||
# Открытие порта
|
||||
EXPOSE 8000
|
||||
|
||||
# Команда по умолчанию
|
||||
CMD ["gunicorn", "config.wsgi:application", "--bind", "0.0.0.0:8000", "--workers", "3"]
|
||||
18
docker/scripts/check-deps.sh
Executable file
18
docker/scripts/check-deps.sh
Executable file
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-container}"
|
||||
|
||||
python - <<'PY'
|
||||
import os
|
||||
|
||||
import django
|
||||
|
||||
django.setup()
|
||||
|
||||
from apps.core.startup_checks import run_startup_checks
|
||||
|
||||
run_startup_checks(component=os.environ["STARTUP_COMPONENT"])
|
||||
print(f"[startup:{os.environ['STARTUP_COMPONENT']}] dependency checks passed")
|
||||
PY
|
||||
15
docker/scripts/migrate.sh
Executable file
15
docker/scripts/migrate.sh
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
export STARTUP_COMPONENT="migrate"
|
||||
|
||||
/app/docker/scripts/check-deps.sh
|
||||
|
||||
python src/manage.py migrate --noinput
|
||||
|
||||
if [ "${COLLECTSTATIC_ON_MIGRATE:-0}" = "1" ]; then
|
||||
python src/manage.py collectstatic --noinput
|
||||
fi
|
||||
|
||||
echo "[startup:migrate] migrations completed"
|
||||
8
docker/scripts/start-celery-beat.sh
Executable file
8
docker/scripts/start-celery-beat.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
|
||||
exec celery -A core beat \
|
||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||
--scheduler django_celery_beat.schedulers:DatabaseScheduler
|
||||
8
docker/scripts/start-celery-worker.sh
Executable file
8
docker/scripts/start-celery-worker.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
|
||||
exec celery -A core worker \
|
||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||
--concurrency="${CELERY_WORKER_CONCURRENCY:-2}"
|
||||
6
docker/scripts/start-web-dev.sh
Executable file
6
docker/scripts/start-web-dev.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
|
||||
exec python src/manage.py runserver "0.0.0.0:${PORT:-8000}"
|
||||
11
docker/scripts/start-web.sh
Executable file
11
docker/scripts/start-web.sh
Executable file
@@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
|
||||
exec gunicorn core.wsgi:application \
|
||||
--bind "0.0.0.0:${PORT:-8000}" \
|
||||
--workers "${GUNICORN_WORKERS:-3}" \
|
||||
--timeout "${GUNICORN_TIMEOUT:-60}" \
|
||||
--access-logfile "-" \
|
||||
--error-logfile "-"
|
||||
Reference in New Issue
Block a user