Replace the in-memory store with PostgreSQL 18.6: SQLAlchemy 2.1 async engine on asyncpg, alembic migrations with an async env.py, repos on AsyncSession and services that own the transaction. Username uniqueness is enforced by the database (ON CONFLICT), a chat and its members are created in one transaction, member order is kept in chat_members.position, and a composite foreign key makes the sender a member of the chat. History and chat lists use keyset pagination on (chat_id, created_at, id) and (user_id, created_at, chat_id). The compose stand runs postgres, a one-shot migrate service on the API image and the API. All Postgres addresses come from .env without literals; only the 127.0.0.1 publish address stays literal. make run_dev starts Postgres and applies migrations before the server, and make env_setup generates a random Postgres password. Unavailable PostgreSQL yields 503: get_db_session bounds the request with asyncio and classifies driver errors. BoundedCloseConnection limits asyncpg's graceful close, which otherwise waited without limit on a frozen server and held the request until it was resumed. Add scripts/restart.sh for make test-persistence and make test_isolated, which runs the image on a throwaway test database. Remove make run_no_compose. X-User-Id identification is unchanged until the session-auth change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
57 lines
2.3 KiB
Docker
57 lines
2.3 KiB
Docker
# Образ API мессенджера (лаба 2): сервер и миграции. Правила —
|
||
# .claude/rules/docker.md.
|
||
# Пины: тег + digest индекса (amd64 и arm64). Обновление версии — новый
|
||
# тег и digest из `docker buildx imagetools inspect <тег>`.
|
||
|
||
# builder: зависимости строго по uv.lock в /app/.venv
|
||
FROM python:3.12.14-slim-trixie@sha256:f77ac9e44ae96ef2c90b8053ea08c31f8be030f824196b0ae4db6d462c84e51f AS builder
|
||
|
||
COPY --from=ghcr.io/astral-sh/uv:0.12.17@sha256:10787c682e4184e4f290de1171fd4703dc63de99221f10fe1c99002ce7fa9acc /uv /bin/uv
|
||
|
||
ENV UV_COMPILE_BYTECODE=1 \
|
||
UV_LINK_MODE=copy \
|
||
UV_PYTHON_DOWNLOADS=never \
|
||
UV_PROJECT_ENVIRONMENT=/app/.venv
|
||
|
||
WORKDIR /app
|
||
|
||
COPY pyproject.toml uv.lock ./
|
||
# --locked: lock не совпадает с pyproject.toml — сборка падает;
|
||
# --no-install-project: src/ сюда не копируется, запуск из /app
|
||
RUN --mount=type=cache,target=/root/.cache/uv \
|
||
uv sync --locked --no-dev --no-install-project
|
||
|
||
|
||
# runtime: интерпретатор базового образа, .venv и src/, без uv
|
||
FROM python:3.12.14-slim-trixie@sha256:f77ac9e44ae96ef2c90b8053ea08c31f8be030f824196b0ae4db6d462c84e51f AS runtime
|
||
|
||
RUN groupadd --system --gid 10001 app \
|
||
&& useradd --system --uid 10001 --gid app --no-create-home \
|
||
--home-dir /nonexistent --shell /usr/sbin/nologin app
|
||
|
||
ENV PATH=/app/.venv/bin:$PATH \
|
||
PYTHONUNBUFFERED=1 \
|
||
PYTHONDONTWRITEBYTECODE=1 \
|
||
APP__RUN_MODE=docker
|
||
|
||
WORKDIR /app
|
||
|
||
# код и .venv принадлежат root: пользователю app — только чтение
|
||
COPY --from=builder /app/.venv /app/.venv
|
||
COPY src ./src
|
||
# сервис migrate compose запускает этот же образ: alembic upgrade head
|
||
COPY alembic.ini ./
|
||
COPY migrations ./migrations
|
||
|
||
USER app
|
||
|
||
EXPOSE 8080
|
||
|
||
# порт — тот же APP__PORT, что слушает приложение (по умолчанию 8080)
|
||
HEALTHCHECK --interval=10s --timeout=3s --start-period=10s \
|
||
--start-interval=1s --retries=3 \
|
||
CMD ["python", "-c", "import os, urllib.request; urllib.request.urlopen('http://127.0.0.1:%s/health/ready' % os.environ.get('APP__PORT', '8080'), timeout=2)"]
|
||
|
||
# exec-форма: сервер — PID 1 и сам получает SIGTERM
|
||
CMD ["python", "-m", "src"]
|