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

docker-compose.yml

@@ -12,12 +12,12 @@ services:
     configs:
       - source: app_config
         target: /data/application.yaml
-      - source: hikari
+    volumes:
-        target: /data/hikari.properties
+      - /opt/docker/eisa/lib:/data/lib:ro
-    entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-cp", "/app.war", "org.springframework.boot.loader.launch.PropertiesLauncher"]
+    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(`(?i)${BRANCH}\\..+`)"
@@ -57,7 +57,7 @@ configs:
       infinispan:
         embedded:
           ${REPLICAS:+enabled: true}
-          cluster-name: eisa-${BRANCH}
+          ${REPLICAS:+cluster-name: eisa-${BRANCH}}          
           stack: tunnel
       spring:
         mail:
@@ -156,9 +156,4 @@ configs:
                 pool-name: uwh
                 minimum-idle: 1
                 maximum-pool-size: 50
-      audit.enabled: true
+      audit.enabled: true
-
-  hikari:
-    content: |
-      minimumIdle=0
-      maximumPoolSize=12