временно убрана настройка smtp

(cherry picked from commit b1f05c3fe4)

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/expert-isa-2-cicd.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="18" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/expert-isa-2-cicd.iml" filepath="$PROJECT_DIR$/.idea/expert-isa-2-cicd.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

docker-compose.yml

@@ -1,24 +1,50 @@
 services:
   eisa:
-    image: git.expertdwh.ru/ewh/expertisa:master
+    image: git.expertdwh.ru/ewh/expertisa:${BRANCH}
     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"
+      - source: hikari
+        target: /data/hikari.properties
+    entrypoint: ["java", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-jar", "/app.war"]
 
     environment:
       JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
-      
-    network_mode: bridge
+
+    labels:
+      - "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"
+
+    networks:
+      - expertisa-twonodes-postgresql
+    depends_on:
+      - psql
+
+  psql:
+    container_name: psql-${BRANCH}
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: "admin"
+      POSTGRES_PASSWORD: "admin"
+      POSTGRES_DB: "expertisa-metadata"
+    networks:
+      - expertisa-twonodes-postgresql
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+
+volumes:
+  pgdata:
+    name: pgdata-${BRANCH}
+
+networks:
+  expertisa-twonodes-postgresql:
+    external: true
 
 configs:
   app_config:
@@ -26,12 +52,25 @@ configs:
       infinispan:
         embedded:
           enabled: true
-          cluster-name: eisa-master
+          cluster-name: eisa-${BRANCH}
+          stack: tunnel
+      #spring:
+      #  mail:
+      #    host: smtp.gmail.com
+      #    port: 587
+      #    username: expertisaewh@gmail.com
+      #    password: ${NOTIFICATION_PASSWORD}
+      #    properties:
+      #      mail:
+      #        smtp:
+      #          auth: true
+      #          starttls:
+      #            enable: true
       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
@@ -40,16 +79,16 @@ configs:
           port: 9000
           access-key: ZfyTrAp9tsxkvfyyEIbC
           secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
-          bucket: master
+          bucket: dev
         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-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
+              username: admin
+              password: admin
             EWH:
-              url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
+              url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-postgresql.preScript
@@ -62,4 +101,8 @@ configs:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
-      audit.enabled: true
+      audit.enabled: true
+
+  hikari:
+    content: |
+      maximumPoolSize=3