From 48d8ba7a2c2841bc195cd9a8af7433dc29d31ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B0?= =?UTF-8?q?=D0=B1=D0=B8=D0=BB=D0=B8=D0=BD?= Date: Fri, 24 Apr 2026 19:36:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=B6=D1=91=D1=81=D1=82=D0=BA=D0=BE=20=D0=BF=D1=80=D0=BE=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81=D0=B5=D0=BA?= =?UTF-8?q?=D1=80=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Makefile | 6 +++--- docker/.env.example | 4 ++++ docker/docker-compose.yml | 13 ++++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 docker/.env.example diff --git a/.gitignore b/.gitignore index 0b4d5a0..e37b086 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ rebar3.crashdump /.tool-versions /rebar.lock /build/ +docker/.env \ No newline at end of file diff --git a/Makefile b/Makefile index efed701..e6013b1 100644 --- a/Makefile +++ b/Makefile @@ -253,7 +253,7 @@ docker-shell: ## Зайти в Docker контейнер docker-compose-up: ## Запустить кластер (3 ноды) @echo "Запуск кластера EventHub (3 ноды)..." - @docker-compose -f docker/docker-compose.yml up -d + @docker-compose -f docker/docker-compose.yml --env-file docker/.env up -d @echo "✅ Кластер запущен" @echo "Node 1: http://localhost:8080" @echo "Node 2: http://localhost:8082" @@ -261,11 +261,11 @@ docker-compose-up: ## Запустить кластер (3 ноды) docker-compose-down: ## Остановить кластер @echo "Остановка кластера..." - @docker-compose -f docker/docker-compose.yml down + @docker-compose -f docker/docker-compose.yml --env-file docker/.env down @echo "✅ Кластер остановлен" docker-compose-logs: ## Показать логи кластера - @docker-compose -f docker/docker-compose.yml logs -f + @docker-compose -f docker/docker-compose.yml --env-file docker/.env logs -f docker-clean: docker-stop ## Очистить Docker образы и volumes @docker rmi eventhub:latest 2>/dev/null || true diff --git a/docker/.env.example b/docker/.env.example new file mode 100644 index 0000000..e97d064 --- /dev/null +++ b/docker/.env.example @@ -0,0 +1,4 @@ +# .env.example — закоммитьте этот файл, а реальный .env держите в .gitignore +RELEASE_COOKIE=ваш-очень-длинный-секретный-куки +GRAFANA_ADMIN_PASSWORD=сложный-уникальный-пароль +JWT_SECRET=суперсекрет \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6959196..a7d2570 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -16,7 +16,8 @@ services: - ADMIN_HTTP_PORT=8445 - ADMIN_WS_PORT=8446 - MNESIA_DIR=/app/data - - RELEASE_COOKIE=eventhub_cookie + - RELEASE_COOKIE=${RELEASE_COOKIE} + - JWT_SECRET=${JWT_SECRET} volumes: - eventhub-node1-data:/app/data networks: @@ -40,7 +41,8 @@ services: - ADMIN_HTTP_PORT=8445 - ADMIN_WS_PORT=8446 - MNESIA_DIR=/app/data - - RELEASE_COOKIE=eventhub_cookie + - RELEASE_COOKIE=${RELEASE_COOKIE} + - JWT_SECRET=${JWT_SECRET} - JOIN_NODES=eventhub-node1@eventhub-node1 volumes: - eventhub-node2-data:/app/data @@ -67,7 +69,8 @@ services: - ADMIN_HTTP_PORT=8445 - ADMIN_WS_PORT=8446 - MNESIA_DIR=/app/data - - RELEASE_COOKIE=eventhub_cookie + - RELEASE_COOKIE=${RELEASE_COOKIE} + - JWT_SECRET=${JWT_SECRET} - JOIN_NODES=eventhub-node1@eventhub-node1 volumes: - eventhub-node3-data:/app/data @@ -85,7 +88,7 @@ services: ports: - "4000:4000" environment: - - RELEASE_COOKIE=eventhub_cookie + - RELEASE_COOKIE=${RELEASE_COOKIE} networks: - eventhub-net restart: unless-stopped @@ -114,7 +117,7 @@ services: - "3000:3000" environment: - GF_SECURITY_ADMIN_USER=admin - - GF_SECURITY_ADMIN_PASSWORD=zxs45gvHB + - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD} volumes: - grafana-data:/var/lib/grafana - ./grafana/provisioning:/etc/grafana/provisioning