Compare commits

...

19 Commits

Author SHA1 Message Date
b9fc8dfa1a Обновить docker-compose.yml 2025-03-03 09:42:50 +00:00
e8883608f4 Обновить docker-compose.yml 2025-02-13 12:26:57 +00:00
338d951c5f Новые настройки пулов соединений с БД 2025-01-23 11:58:20 +00:00
1832f0ce2d добавлен preScript для oracle 2025-01-15 14:49:51 +00:00
93a05e8cf2 Ставим лимиты стендам 2025-01-10 16:41:08 +00:00
2523ef6395 Обновить docker-compose.yml 2025-01-09 08:56:49 +00:00
de8d8d2ef4 Меняем healthcheck на readiness probe 2025-01-02 11:03:09 +00:00
a6db7bc427 добавлены настройки для нотификации 2024-12-06 13:43:42 +00:00
b1f05c3fe4 Added .gitignore 2024-11-13 12:45:17 +03:00
484a495068 JAVA_TOOL_OPTIONS в настройки стека, вместо Dockerfile 2024-11-11 20:48:38 +03:00
a1b33b38ad Реплики в docker-compose.yml вместо нескольких стеков. 2024-10-01 18:31:25 +03:00
d359e0ece2 pre/post скрипты для Postgresql 2024-09-27 13:04:51 +03:00
8517a39e1a Принудительно включаем infinispan, т.к. по умолчанию он будет выключен. 2024-09-13 17:28:16 +03:00
dfcb3fe362 Убираем mount на физический диск. 2024-09-11 11:44:45 +03:00
49e7b7302c Поменял healthcheck эндпоинт. 2024-08-21 13:58:23 +03:00
74482bf77d Merge remote-tracking branch 'origin/master' 2024-08-20 18:15:54 +03:00
2e9e16f95d Убрал management из настроек. 2024-08-20 18:15:42 +03:00
9b4f93b4bf Настройки S3 для master 2024-08-07 08:30:47 +00:00
d54753b7e1 restart: unless-stopped 2024-07-03 17:10:09 +03:00
2 changed files with 69 additions and 14 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/.idea/misc.xml
/.idea/vcs.xml
/.idea/workspace.xml

View File

@ -2,9 +2,12 @@ services:
eisa:
image: git.expertdwh.ru/ewh/expertisa:master
pull_policy: always
volumes:
- /opt/docker/eisa/master:/data
- /opt/docker/eisa/master-files:/data/uploaded-files
restart: unless-stopped
deploy:
replicas: 3
resources:
limits:
memory: 10G
configs:
- source: app_config
target: /data/application.yaml
@ -12,9 +15,12 @@ services:
labels:
- "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
- "traefik.http.routers.expertisa-master.tls=true"
- "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/actuator/health"
- "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/health/readiness"
- "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
environment:
JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
network_mode: bridge
configs:
@ -22,7 +28,22 @@ configs:
content: |
infinispan:
embedded:
cluster-name: master
enabled: true
cluster-name: eisa-master
spring:
mail:
host: smtp.yandex.ru
port: 465
username: expertisaewh@yandex.ru
password: ${NOTIFICATION_PASSWORD}
properties:
mail:
transport:
protocol: smtps
smtp:
auth: true
ssl:
enable: true
eisa:
force-core-update: true
metadata-git:
@ -30,31 +51,62 @@ configs:
branch: master
enabled: true
token: ${GIT_TOKEN}
file-store-type: s3
s3:
endpoint: minio.app.expertdwh.ru
port: 9000
access-key: Q13rej1S6TdtXKb5Fuw5
secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
bucket: master
db:
common-datasource-name: meta
camunda-datasource-name: meta-camunda
jdbc:
meta:
url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
username: ewh
password: ${EWH_PASSWORD}
pool:
minimum-idle: 1
max-pool-size: 10
meta-camunda:
url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
username: ewh
password: ${EWH_PASSWORD}
pool:
minimum-idle: 1
max-pool-size: 12
EWH:
url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
username: ewh
password: ${EWH_PASSWORD}
pre-script: core-postgresql.preScript
post-script: core-postgresql.postScript
pool:
minimum-idle: 1
max-pool-size: 10
EWH_ORA:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: ewh
password: ${EWH_PASSWORD}
pre-script: core-oracle.preScript
pool:
minimum-idle: 1
max-pool-size: 10
DWH_ORA:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: dwh
password: ${DWH_PASSWORD}
management:
endpoints:
web:
exposure:
include: '*'
jmx:
exposure:
include: '*'
audit.enabled: true
pre-script: core-oracle.preScript
pool:
minimum-idle: 1
max-pool-size: 10
MSSQL:
url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
username: sa
password: ${EWH_PASSWORD}
audit.enabled: true
logging:
level:
root: debug
ru.expertdwh: trace