Доработки по обработке REPLICAS

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: 2
+      replicas: ${REPLICAS:-1}
       resources:
         limits:
           cpus: '4.0'
@@ -12,15 +12,15 @@ services:
     configs:
       - source: app_config
         target: /data/application.yaml
-      - source: hikari
-        target: /data/hikari.properties
-    entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-jar", "/app.war"]
+    volumes:
+      - /opt/docker/eisa/lib:/data/lib:ro
+    entrypoint: ["java", "-Deisa.branch=${BRANCH}", "-cp", "/app.war", "org.springframework.boot.loader.launch.PropertiesLauncher"]
 
     environment:
-      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
+      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90 -Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]"
 
     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/readiness"
       - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
@@ -32,7 +32,7 @@ services:
 
   psql:
     container_name: psql-${BRANCH}
-    image: postgres:latest
+    image: postgres:9.4
     restart: unless-stopped
     environment:
       POSTGRES_USER: "admin"
@@ -56,8 +56,8 @@ configs:
     content: |
       infinispan:
         embedded:
-          enabled: true
-          cluster-name: eisa-${BRANCH}
+          ${REPLICAS:+enabled: true}
+          ${REPLICAS:+cluster-name: eisa-${BRANCH}}          
           stack: tunnel
       spring:
         mail:
@@ -82,7 +82,7 @@ configs:
           token: ${GIT_TOKEN}
         personal-tunes-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
-          branch: master
+          branch: ${BRANCH}
           enabled: true
           token: ${GIT_TOKEN}
         file-store-type: s3
@@ -100,37 +100,60 @@ configs:
               url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
               username: admin
               password: admin
+              pool:
+                pool-name: psql
+                minimum-idle: 1
+                maximum-pool-size: 50
             psql-camunda:
               url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
               username: admin
               password: admin
+              pool:
+                pool-name: psql-camunda
+                minimum-idle: 1
+                maximum-pool-size: 50
             EWH:
               url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-postgresql.preScript
               post-script: core-postgresql.postScript
+              pool:
+                pool-name: ewh
+                minimum-idle: 1
+                maximum-pool-size: 50
             EWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-oracle.preScript
+              pool:
+                pool-name: ewh_ora
+                minimum-idle: 1
+                maximum-pool-size: 50
             DWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
               pre-script: core-oracle.preScript
+              pool:
+                pool-name: dwh_ora
+                minimum-idle: 1
+                maximum-pool-size: 50
             MSSQL:
               url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
               username: sa
               password: ${EWH_PASSWORD}
+              pool:
+                pool-name: mssql
+                minimum-idle: 1
+                maximum-pool-size: 50
             uwh:
               url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true
               username: uwh
               password: uwh
+              pool:
+                pool-name: uwh
+                minimum-idle: 1
+                maximum-pool-size: 50
       audit.enabled: true
-
-  hikari:
-    content: |
-      minimumIdle=0
-      maximumPoolSize=12