Add initial implementations for forms and organization apps with serializers, factories, and admin configurations
Some checks failed
CI/CD Pipeline / Run Tests (push) Failing after 45s
CI/CD Pipeline / Code Quality Checks (push) Failing after 48s
CI/CD Pipeline / Build Docker Images (push) Has been skipped
CI/CD Pipeline / Push to Gitea Registry (push) Has been skipped
CI/CD Pipeline / Deploy to Server (push) Has been skipped
Some checks failed
CI/CD Pipeline / Run Tests (push) Failing after 45s
CI/CD Pipeline / Code Quality Checks (push) Failing after 48s
CI/CD Pipeline / Build Docker Images (push) Has been skipped
CI/CD Pipeline / Push to Gitea Registry (push) Has been skipped
CI/CD Pipeline / Deploy to Server (push) Has been skipped
This commit is contained in:
80
docker/Dockerfile
Normal file
80
docker/Dockerfile
Normal file
@@ -0,0 +1,80 @@
|
||||
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 src/static \
|
||||
&& chmod +x /app/docker/scripts/*.sh \
|
||||
&& chown -R appuser:appgroup /app
|
||||
|
||||
ENV PATH="/app/.venv/bin:${PATH}" \
|
||||
PYTHONPATH=/app/src
|
||||
|
||||
USER appuser
|
||||
ENTRYPOINT ["/app/docker/scripts/entrypoint.sh"]
|
||||
|
||||
|
||||
FROM runtime-base AS runtime-web
|
||||
|
||||
EXPOSE 8000
|
||||
CMD ["web"]
|
||||
|
||||
|
||||
FROM runtime-base AS runtime-celery
|
||||
|
||||
CMD ["celery-worker"]
|
||||
@@ -1,61 +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
|
||||
|
||||
# Создание пользователя для запуска приложения
|
||||
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,44 +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
|
||||
|
||||
# Создание пользователя для запуска приложения
|
||||
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"]
|
||||
23
docker/scripts/check-deps.sh
Executable file
23
docker/scripts/check-deps.sh
Executable file
@@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-container}"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
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
|
||||
110
docker/scripts/entrypoint.sh
Normal file
110
docker/scripts/entrypoint.sh
Normal file
@@ -0,0 +1,110 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
COMMAND_NAME="${1:-web}"
|
||||
COMMAND_BASENAME="${COMMAND_NAME##*/}"
|
||||
|
||||
log() {
|
||||
printf '%s\n' "$*" >&2
|
||||
}
|
||||
|
||||
validate_settings_module() {
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
*)
|
||||
log "[startup] unsupported DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
run_dependency_checks() {
|
||||
/app/docker/scripts/check-deps.sh
|
||||
}
|
||||
|
||||
run_migrations_if_enabled() {
|
||||
default_value="$1"
|
||||
if [ "${RUN_MIGRATIONS:-$default_value}" = "1" ]; then
|
||||
log "[startup:${STARTUP_COMPONENT}] applying migrations"
|
||||
python src/manage.py migrate --noinput
|
||||
fi
|
||||
}
|
||||
|
||||
run_collectstatic_on_migrate() {
|
||||
if [ "${COLLECTSTATIC_ON_MIGRATE:-0}" = "1" ]; then
|
||||
log "[startup:${STARTUP_COMPONENT}] collecting static files"
|
||||
python src/manage.py collectstatic --noinput
|
||||
fi
|
||||
}
|
||||
|
||||
start_web() {
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-web}"
|
||||
validate_settings_module
|
||||
run_dependency_checks
|
||||
run_migrations_if_enabled 1
|
||||
shift
|
||||
exec /app/docker/scripts/start-web.sh "$@"
|
||||
}
|
||||
|
||||
start_web_dev() {
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-web}"
|
||||
validate_settings_module
|
||||
run_dependency_checks
|
||||
run_migrations_if_enabled 1
|
||||
shift
|
||||
exec /app/docker/scripts/start-web-dev.sh "$@"
|
||||
}
|
||||
|
||||
start_celery_worker() {
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-celery_worker}"
|
||||
validate_settings_module
|
||||
run_dependency_checks
|
||||
run_migrations_if_enabled 0
|
||||
shift
|
||||
exec /app/docker/scripts/start-celery-worker.sh "$@"
|
||||
}
|
||||
|
||||
start_celery_beat() {
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-celery_beat}"
|
||||
validate_settings_module
|
||||
run_dependency_checks
|
||||
run_migrations_if_enabled 0
|
||||
shift
|
||||
exec /app/docker/scripts/start-celery-beat.sh "$@"
|
||||
}
|
||||
|
||||
run_migrate() {
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-migrate}"
|
||||
validate_settings_module
|
||||
run_dependency_checks
|
||||
run_migrations_if_enabled 1
|
||||
run_collectstatic_on_migrate
|
||||
log "[startup:${STARTUP_COMPONENT}] migrations completed"
|
||||
}
|
||||
|
||||
case "${COMMAND_BASENAME}" in
|
||||
web|start-web.sh)
|
||||
start_web "$@"
|
||||
;;
|
||||
web-dev|start-web-dev.sh)
|
||||
start_web_dev "$@"
|
||||
;;
|
||||
celery-worker|start-celery-worker.sh)
|
||||
start_celery_worker "$@"
|
||||
;;
|
||||
celery-beat|start-celery-beat.sh)
|
||||
start_celery_beat "$@"
|
||||
;;
|
||||
migrate|migrate.sh)
|
||||
run_migrate
|
||||
;;
|
||||
*)
|
||||
exec "$@"
|
||||
;;
|
||||
esac
|
||||
20
docker/scripts/migrate.sh
Executable file
20
docker/scripts/migrate.sh
Executable file
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
export STARTUP_COMPONENT="migrate"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
/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"
|
||||
13
docker/scripts/start-celery-beat.sh
Executable file
13
docker/scripts/start-celery-beat.sh
Executable file
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
exec celery -A core beat \
|
||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||
--scheduler django_celery_beat.schedulers:DatabaseScheduler
|
||||
14
docker/scripts/start-celery-worker.sh
Executable file
14
docker/scripts/start-celery-worker.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
exec celery -A core worker \
|
||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||
--concurrency="${CELERY_WORKER_CONCURRENCY:-1}" \
|
||||
--max-memory-per-child="${CELERY_WORKER_MAX_MEMORY_PER_CHILD_KB:-3145728}"
|
||||
11
docker/scripts/start-web-dev.sh
Executable file
11
docker/scripts/start-web-dev.sh
Executable file
@@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
exec python src/manage.py runserver "0.0.0.0:${PORT:-8000}"
|
||||
17
docker/scripts/start-web.sh
Executable file
17
docker/scripts/start-web.sh
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env sh
|
||||
set -eu
|
||||
|
||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-web}"
|
||||
|
||||
case "${DJANGO_SETTINGS_MODULE}" in
|
||||
settings.dev|settings.production|settings.test)
|
||||
;;
|
||||
esac
|
||||
|
||||
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