Обновить docker-compose.yml

docker-compose.yml

@@ -12,15 +12,18 @@ 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]", "-jar", "/app.war"]
+    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=75 -Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]"
+
+    env_file:
+      - stack.env
 
     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 +45,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 +64,7 @@ configs:
       infinispan:
         embedded:
           ${REPLICAS:+enabled: true}
-          cluster-name: eisa-${BRANCH}
+          ${REPLICAS:+cluster-name: eisa-${BRANCH}}          
           stack: tunnel
       spring:
         mail:
@@ -80,6 +87,9 @@ configs:
           branch: ${BRANCH}
           enabled: true
           token: ${GIT_TOKEN}
+          branches:
+            enabled: true
+            protect-main-branch-merge: 
         personal-tunes-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
           branch: ${BRANCH}
@@ -92,6 +102,41 @@ configs:
           access-key: Q13rej1S6TdtXKb5Fuw5
           secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
           bucket: dev
+        file-store:
+          smb:
+            name: share
+            access: all
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share
+              username: ewh
+              password: admin
+          smb2:
+            name: share2
+            access: load
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share2
+              username: ewh2
+              password: admin
+          smb2-save:
+            name: share2-save
+            access: save
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share2
+              username: ewh2
+              password: admin
+          empty:
+            name: empty user
+            access: all
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share
         db:
           common-datasource-name: psql
           camunda-datasource-name: psql-camunda
@@ -100,37 +145,61 @@ 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
+              pre-script: oracle-utils.session-init
+              post-script: oracle-utils.session-clear
+              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