From b26b2cf0725b7e3e9a14d86d376d433e1cb792cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Fri, 2 Oct 2026 12:40:55 +0300 Subject: [PATCH] chore(infra): add compose stack and restart hook --- compose.yaml | 62 ++++++++++++++++++++++++++++++++++++++++++++++ scripts/restart.sh | 39 +++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 compose.yaml create mode 100644 scripts/restart.sh diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..908e98de --- /dev/null +++ b/compose.yaml @@ -0,0 +1,62 @@ +name: mtusi-messenger-lab2 + +services: + postgres: + image: postgres:16.4-alpine + restart: unless-stopped + environment: + POSTGRES_USER: messenger + POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password + POSTGRES_DB: messenger + secrets: + - postgres_password + volumes: + - postgres_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U messenger -d messenger"] + interval: 5s + timeout: 3s + retries: 10 + start_period: 5s + networks: + - internal + + api: + build: + context: . + dockerfile: Dockerfile + image: mtusi-messenger-api:lab2 + restart: unless-stopped + ports: + - "8080:8080" + environment: + APP_HOST: "0.0.0.0" + APP_PORT: "8080" + DATABASE_URL_FILE: /run/secrets/database_url + SESSION_TTL_SECONDS: "3600" + secrets: + - database_url + depends_on: + postgres: + condition: service_healthy + healthcheck: + test: ["CMD-SHELL", "wget -q -O - http://127.0.0.1:8080/health/ready >/dev/null || exit 1"] + interval: 10s + timeout: 3s + retries: 5 + start_period: 15s + networks: + - internal + +secrets: + postgres_password: + file: ./secrets/postgres_password + database_url: + file: ./secrets/database_url + +volumes: + postgres_data: + +networks: + internal: + driver: bridge \ No newline at end of file diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100644 index 00000000..611a1b68 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,39 @@ +#!/bin/sh +set -eu + +# Перезапускает API и все используемые хранилища, сохраняя volumes и данные. +# Не удаляет volumes, не пересоздаёт схему, не сидит данные заново. +# Возвращает 0 только после фактической остановки и запуска контейнеров. + +cd "$(dirname "$0")/.." + +COMPOSE="docker compose" +if ! $COMPOSE version >/dev/null 2>&1; then + COMPOSE="docker-compose" +fi + +if [ ! -f .env ]; then + : > .env +fi + +echo "[restart] останавливаем api и postgres" >&2 +$COMPOSE --env-file .env stop api postgres + +echo "[restart] запускаем postgres и ждём healthy" >&2 +$COMPOSE --env-file .env start postgres + +i=0 +until [ "$($COMPOSE ps -q postgres | xargs -r docker inspect -f '{{.State.Health.Status}}' 2>/dev/null)" = "healthy" ]; do + i=$((i + 1)) + if [ "$i" -gt 60 ]; then + echo "[restart] postgres не стал healthy за 60 секунд" >&2 + exit 1 + fi + sleep 1 +done + +echo "[restart] запускаем api" >&2 +$COMPOSE --env-file .env start api + +echo "[restart] готово" >&2 +exit 0 \ No newline at end of file