From eaf04c4769d3b031e371a297a097777b3e63e8e6 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 14:42:55 +0300 Subject: [PATCH] chore(infra): redis service with AOF persistence --- compose.yaml | 30 ++++++++++++++++++++++++++++++ scripts/restart.cmd | 5 +++++ scripts/restart.sh | 32 +++++++++++++++++++------------- 3 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 scripts/restart.cmd diff --git a/compose.yaml b/compose.yaml index 908e98d..7ff31ce 100644 --- a/compose.yaml +++ b/compose.yaml @@ -21,6 +21,28 @@ services: networks: - internal + redis: + image: redis:7.4-alpine + restart: unless-stopped + command: + - redis-server + - --appendonly + - "yes" + - --appendfsync + - everysec + - --save + - "60 1000" + volumes: + - redis_data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 3s + retries: 10 + start_period: 5s + networks: + - internal + api: build: context: . @@ -33,12 +55,17 @@ services: APP_HOST: "0.0.0.0" APP_PORT: "8080" DATABASE_URL_FILE: /run/secrets/database_url + CACHE_URL_FILE: /run/secrets/cache_url + SESSION_STORE: "redis" SESSION_TTL_SECONDS: "3600" secrets: - database_url + - cache_url depends_on: postgres: condition: service_healthy + redis: + condition: service_healthy healthcheck: test: ["CMD-SHELL", "wget -q -O - http://127.0.0.1:8080/health/ready >/dev/null || exit 1"] interval: 10s @@ -53,9 +80,12 @@ secrets: file: ./secrets/postgres_password database_url: file: ./secrets/database_url + cache_url: + file: ./secrets/cache_url volumes: postgres_data: + redis_data: networks: internal: diff --git a/scripts/restart.cmd b/scripts/restart.cmd new file mode 100644 index 0000000..8568136 --- /dev/null +++ b/scripts/restart.cmd @@ -0,0 +1,5 @@ +@echo off +setlocal +set SCRIPT_DIR=%~dp0 +bash "%SCRIPT_DIR%restart.sh" +exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/scripts/restart.sh b/scripts/restart.sh index 611a1b6..9e50da9 100644 --- a/scripts/restart.sh +++ b/scripts/restart.sh @@ -3,7 +3,6 @@ set -eu # Перезапускает API и все используемые хранилища, сохраняя volumes и данные. # Не удаляет volumes, не пересоздаёт схему, не сидит данные заново. -# Возвращает 0 только после фактической остановки и запуска контейнеров. cd "$(dirname "$0")/.." @@ -16,21 +15,28 @@ if [ ! -f .env ]; then : > .env fi -echo "[restart] останавливаем api и postgres" >&2 -$COMPOSE --env-file .env stop api postgres +echo "[restart] останавливаем api, postgres, redis" >&2 +$COMPOSE --env-file .env stop api postgres redis -echo "[restart] запускаем postgres и ждём healthy" >&2 +echo "[restart] запускаем postgres" >&2 $COMPOSE --env-file .env start postgres +wait_healthy() { + service="$1" + i=0 + until [ "$($COMPOSE ps -q "$service" | xargs -r docker inspect -f '{{.State.Health.Status}}' 2>/dev/null)" = "healthy" ]; do + i=$((i + 1)) + if [ "$i" -gt 60 ]; then + echo "[restart] $service не стал healthy за 60 секунд" >&2 + exit 1 + fi + sleep 1 + done +} +wait_healthy 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] запускаем redis" >&2 +$COMPOSE --env-file .env start redis +wait_healthy redis echo "[restart] запускаем api" >&2 $COMPOSE --env-file .env start api