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: