From 50443bb954bef0c4fbb144be5ff3b51081a559c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=BE=D1=81=D1=82=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD?=
 =?UTF-8?q?=D0=B4=D1=80=D0=B5=D0=B9?= <postnov@expertdwh.ru>
Date: Wed, 25 Mar 2026 19:28:47 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20docker-compose.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 12f05bb..0edb3c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,9 @@ services:
     environment:
       JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=75 -Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]"
 
+    env_file:
+      - stack.env
+
     labels:
       - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`(?i)^${BRANCH}\\..+`)"
       - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
@@ -86,6 +89,7 @@ configs:
           token: ${GIT_TOKEN}
           branches:
             enabled: true
+            protect-main-branch-merge: 
         personal-tunes-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
           branch: ${BRANCH}