изменён docker-compose.yml

.gitignore

@@ -1,3 +0,0 @@
-/.idea/misc.xml
-/.idea/vcs.xml
-/.idea/workspace.xml

docker-compose.yml

@@ -4,24 +4,34 @@ services:
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: 3
+      replicas: 2
-      resources:
-        limits:
-          memory: 10G
     configs:
       - source: app_config
         target: /data/application.yaml
 
     labels:
-      - "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
-      - "traefik.http.routers.expertisa-master.tls=true"
+      - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/health/readiness"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
 
+    networks:
+      - expertisa-twonodes-postgresql
+    depends_on:
+      - psql
+
+  psql:
+    image: postgres:latest
     environment:
-      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
+      POSTGRES_USER: "admin"
+      POSTGRES_PASSWORD: "admin"
+      POSTGRES_DB: "expertisa-metadata"
+    networks:
+      - expertisa-twonodes-postgresql
 
-    network_mode: bridge
+networks:
+  expertisa-twonodes-postgresql:
+    external: true
 
 configs:
   app_config:
@@ -29,84 +39,40 @@ configs:
       infinispan:
         embedded:
           enabled: true
-          cluster-name: eisa-master
+          cluster-name: eisa-${BRANCH}
-      spring:
-        mail:
-          host: smtp.yandex.ru
-          port: 465
-          username: expertisaewh@yandex.ru
-          password: ${NOTIFICATION_PASSWORD}
-          properties:
-            mail:
-              transport:
-                protocol: smtps
-              smtp:
-                auth: true
-                ssl:
-                  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
+        #file-store-type: s3
-        s3:
+        #s3:
-          endpoint: minio.app.expertdwh.ru
+        #  endpoint: minio.app.expertdwh.ru
-          port: 9000
+        #  port: 9000
-          access-key: Q13rej1S6TdtXKb5Fuw5
+        #  access-key: ZfyTrAp9tsxkvfyyEIbC
-          secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
+        #  secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
-          bucket: master
+        #  bucket: master
         db:
-          common-datasource-name: meta
+          common-datasource-name: psql
-          camunda-datasource-name: meta-camunda
           jdbc:
-            meta:
+            psql:
-              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
+              url: jdbc:postgresql://psql:5432/expertisa-metadata
-              username: ewh
+              username: admin
-              password: ${EWH_PASSWORD}
+              password: admin
-              pool:
-                minimum-idle: 1
-                max-pool-size: 10
-            meta-camunda:
-              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
-              username: ewh
-              password: ${EWH_PASSWORD}
-              pool:
-                minimum-idle: 1
-                max-pool-size: 12
             EWH:
               url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-postgresql.preScript
               post-script: core-postgresql.postScript
-              pool:
-                minimum-idle: 1
-                max-pool-size: 10
             EWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
               password: ${EWH_PASSWORD}
-              pre-script: core-oracle.preScript
-              pool:
-                minimum-idle: 1
-                max-pool-size: 10
             DWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
-              pre-script: core-oracle.preScript
-              pool:
-                minimum-idle: 1
-                max-pool-size: 10
-            MSSQL:
-              url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
-              username: sa
-              password: ${EWH_PASSWORD}
       audit.enabled: true
-      logging:
-        level:
-          root: debug
-          ru.expertdwh: trace