From 7d89e24c2aba0640ce207502de2c0818ba055c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=BE=D1=81=D1=82=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD?= =?UTF-8?q?=D0=B4=D1=80=D0=B5=D0=B9?= Date: Fri, 6 Jun 2025 12:44:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=B2=D1=8B=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=83=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=20JDBC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ff6b1ad..a58b000 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: 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"] + 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"] environment: JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90" @@ -100,34 +100,62 @@ 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: