diff --git a/docker-compose.yml b/docker-compose.yml index 14a720f..6803feb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,14 +19,6 @@ services: - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s" - "traefik.http.routers.expertisa-master.service=expertisa-master" - - "traefik.http.services.expertisa-master-1.loadbalancer.server.url=http://eisa:8080" - - "traefik.http.routers.expertisa-master-1.rule=HostRegexp(`(?i)master-1\\..+`)" - - "traefik.http.routers.expertisa-master-1.service=expertisa-master-1" - - - "traefik.http.services.expertisa-master-2.loadbalancer.server.url=http://172.17.0.11:8080" - - "traefik.http.routers.expertisa-master-2.rule=HostRegexp(`(?i)master-2\\..+`)" - - "traefik.http.routers.expertisa-master-2.service=expertisa-master-2" - environment: JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90" @@ -76,15 +68,17 @@ configs: username: ewh password: ${EWH_PASSWORD} pool: + pool-name: meta minimum-idle: 1 - max-pool-size: 10 + max-pool-size: 50 meta-camunda: url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master username: ewh password: ${EWH_PASSWORD} pool: + pool-name: meta-camunda minimum-idle: 1 - max-pool-size: 12 + max-pool-size: 50 EWH: url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh username: ewh @@ -92,28 +86,35 @@ configs: pre-script: core-postgresql.preScript post-script: core-postgresql.postScript pool: + pool-name: ewh minimum-idle: 1 - max-pool-size: 10 + max-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 - max-pool-size: 10 + max-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 - max-pool-size: 10 + max-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 + max-pool-size: 50 audit.enabled: true logging: level: