From 2cb29f9178458ab6c8918c14c97341462966b8fb Mon Sep 17 00:00:00 2001
From: StepanDemin <styopa-d@yandex.ru>
Date: Fri, 4 Oct 2024 10:53:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20do?=
 =?UTF-8?q?cker-compose.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 56 +++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 147cfdc..1fc67c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,18 +4,34 @@ services:
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: 3
+      replicas: 2
     configs:
       - source: app_config
         target: /data/application.yaml
 
     labels:
-      - "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
-      - "traefik.http.routers.expertisa-master.tls=true"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/health"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
 
-    network_mode: bridge
+    networks:
+      - expertisa-twonodes-postgresql
+    depends_on:
+      - psql
+
+  psql:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: "admin"
+      POSTGRES_PASSWORD: "admin"
+      POSTGRES_DB: "expertisa-metadata"
+    networks:
+      - expertisa-twonodes-postgresql
+
+networks:
+  expertisa-twonodes-postgresql:
+    external: true
 
 configs:
   app_config:
@@ -23,28 +39,28 @@ configs:
       infinispan:
         embedded:
           enabled: true
-          cluster-name: eisa-master
+          cluster-name: eisa-${BRANCH}
       eisa:
         force-core-update: true
         metadata-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-metadata
-          branch: master
+          branch: ${BRANCH}
           enabled: true
           token: ${GIT_TOKEN}
-        file-store-type: s3
-        s3:
-          endpoint: minio.app.expertdwh.ru
-          port: 9000
-          access-key: ZfyTrAp9tsxkvfyyEIbC
-          secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
-          bucket: master
+        #file-store-type: s3
+        #s3:
+        #  endpoint: minio.app.expertdwh.ru
+        #  port: 9000
+        #  access-key: ZfyTrAp9tsxkvfyyEIbC
+        #  secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
+        #  bucket: master
         db:
-          common-datasource-name: meta
+          common-datasource-name: psql
           jdbc:
-            meta:
-              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
-              username: ewh
-              password: ${EWH_PASSWORD}
+            psql:
+              url: jdbc:postgresql://psql:5432/expertisa-metadata
+              username: admin
+              password: admin
             EWH:
               url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
               username: ewh