Даём возможность соединиться с техническим PG стендов.

docker-compose.yml

@@ -12,15 +12,15 @@ 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}\\..+`)"
+      - "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"
@@ -42,6 +42,10 @@ services:
       - expertisa-twonodes-postgresql
     volumes:
       - pgdata:/var/lib/postgresql/data
+    labels:
+      - "traefik.tcp.routers.pg-${BRANCH}.entrypoints=pg"
+      - "traefik.tcp.routers.pg-${BRANCH}.tls=true"
+      - "traefik.tcp.routers.pg-${BRANCH}.rule=HostSNIRegexp(`(?i)^${BRANCH}\\..+`)"
 
 volumes:
   pgdata:
@@ -57,7 +61,7 @@ configs:
       infinispan:
         embedded:
           ${REPLICAS:+enabled: true}
-          cluster-name: eisa-${BRANCH}
+          ${REPLICAS:+cluster-name: eisa-${BRANCH}}          
           stack: tunnel
       spring:
         mail:
@@ -135,7 +139,8 @@ configs:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
-              pre-script: core-oracle.preScript
+              pre-script: oracle-utils.session-init
+              post-script: oracle-utils.session-clear
               pool:
                 pool-name: dwh_ora
                 minimum-idle: 1
@@ -157,8 +162,3 @@ configs:
                 minimum-idle: 1
                 maximum-pool-size: 50
       audit.enabled: true
-
-  hikari:
-    content: |
-      minimumIdle=0
-      maximumPoolSize=12