изменена версия postgre с latest на 9.4

(cherry picked from commit b1f05c3fe4)

.gitignore

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

docker-compose.yml

@@ -4,21 +4,25 @@ services:
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: 2
+      replicas: ${REPLICAS:-1}
+      resources:
+        limits:
+          cpus: '4.0'
+          memory: 4G
     configs:
       - source: app_config
         target: /data/application.yaml
       - source: hikari
         target: /data/hikari.properties
-    entrypoint: ["java", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-jar", "/app.war"]
+    entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-jar", "/app.war"]
 
     environment:
       JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
 
     labels:
-      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`(?i)${BRANCH}\\..+`)"
       - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
-      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health/readiness"
       - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
 
     networks:
@@ -28,7 +32,8 @@ services:
 
   psql:
     container_name: psql-${BRANCH}
-    image: postgres:latest
+    image: postgres:9.4
+    restart: unless-stopped
     environment:
       POSTGRES_USER: "admin"
       POSTGRES_PASSWORD: "admin"
@@ -51,9 +56,23 @@ configs:
     content: |
       infinispan:
         embedded:
-          enabled: true
+          ${REPLICAS:+enabled: true}
           cluster-name: eisa-${BRANCH}
           stack: tunnel
+      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:
@@ -61,20 +80,30 @@ configs:
           branch: ${BRANCH}
           enabled: true
           token: ${GIT_TOKEN}
+        personal-tunes-git:
+          url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
+          branch: ${BRANCH}
+          enabled: true
+          token: ${GIT_TOKEN}
         file-store-type: s3
         s3:
           endpoint: minio.app.expertdwh.ru
           port: 9000
-          access-key: ZfyTrAp9tsxkvfyyEIbC
+          access-key: Q13rej1S6TdtXKb5Fuw5
-          secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
+          secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
           bucket: dev
         db:
           common-datasource-name: psql
+          camunda-datasource-name: psql-camunda
           jdbc:
             psql:
               url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
               username: admin
               password: admin
+            psql-camunda:
+              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
+              username: admin
+              password: admin
             EWH:
               url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
               username: ewh
@@ -85,12 +114,23 @@ configs:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
               password: ${EWH_PASSWORD}
+              pre-script: core-oracle.preScript
             DWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
+              pre-script: core-oracle.preScript
+            MSSQL:
+              url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
+              username: sa
+              password: ${EWH_PASSWORD}
+            uwh:
+              url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true
+              username: uwh
+              password: uwh
       audit.enabled: true
 
   hikari:
     content: |
-      maximumPoolSize=3
+      minimumIdle=0
+      maximumPoolSize=12