From a2ccf167aa39eedb7734c19e961916802a8deb93 Mon Sep 17 00:00:00 2001 From: Aleksey Sabilin Date: Sun, 12 Jul 2026 11:58:21 +0300 Subject: [PATCH] =?UTF-8?q?chore(docker):=20prune=20=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20swa?= =?UTF-8?q?rm-deploy,=20env=20=D1=81=D1=82=D0=B5=D0=BD=D0=B4=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docker/.env.ift и .env.stage локально, не в репозитории; image prune в make docker-swarm-deploy. --- .gitignore | 2 ++ Makefile | 2 ++ docker/.env.stage | 14 -------------- 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 docker/.env.stage diff --git a/.gitignore b/.gitignore index b07d0d2..9feac05 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ rebar3.crashdump /rebar.lock /build/ docker/.env +docker/.env.ift +docker/.env.stage /Mnesia.*/ /doc/ diff --git a/Makefile b/Makefile index 0dd8b3d..aefacc3 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,8 @@ docker-swarm-deploy: ## ????????? ??????? @docker stack deploy -c docker/docker-compose.swarm.yml eventhub --detach=true @bash ../EventHubDevOps/scripts/setup-docker-container-prune.sh 2>/dev/null || true @bash ../EventHubDevOps/scripts/docker-container-prune-now.sh 2>/dev/null || true + @bash ../EventHubDevOps/scripts/setup-docker-image-prune.sh 2>/dev/null || true + @bash ../EventHubDevOps/scripts/docker-image-prune-now.sh 2>/dev/null || true @echo "? ??????? ???????" @echo "Admin UI: https://admin-ui.stage.eventhub.local" diff --git a/docker/.env.stage b/docker/.env.stage deleted file mode 100644 index 7493557..0000000 --- a/docker/.env.stage +++ /dev/null @@ -1,14 +0,0 @@ -EVENTHUB_ENV=stage -RELEASE_COOKIE=FuNHSU3SIiW8ICu2XIbl0pvpxAhpBvO2Wki7CT6q2bpHDSlQ8p7gtUgjnyXpPJU5 -GRAFANA_ADMIN_PASSWORD=замените-сильный-пароль-grafana -JWT_SECRET=IDhKNFRLZFDYgPvVXwg4T7hAviQ2I1VGeEn5vXufQXK3AAErZuhMWy8J1uxJ0kGF -ADMIN_JWT_SECRET=K3AAErZuhMWy8J1uxJ0kGFIDhKNFRLZFDYgPvVXwg4T7hAviQ2I1VGeEn5vXufQ -TRAEFIK_LOG_PATH=/app/traefik/logs/access.log -ADMIN_SUPER_EMAIL=superadmin@eventhub.local -ADMIN_SUPER_PASSWORD=замените-сильный-пароль-суперадмина-мин32 -ADMIN_EMAIL=admin@eventhub.local -ADMIN_PASSWORD=замените-сильный-пароль-админа-минимум32 -ADMIN_MODER_EMAIL=moderator@eventhub.local -ADMIN_MODER_PASSWORD=замените-сильный-пароль-модератора-мин32 -ADMIN_SUPPORT_EMAIL=support@eventhub.local -ADMIN_SUPPORT_PASSWORD=замените-сильный-пароль-поддержки-мин32