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}