Compare commits

...

11 Commits
test ... master

2 changed files with 21 additions and 13 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,9 @@ services:
eisa: eisa:
image: git.expertdwh.ru/ewh/expertisa:master image: git.expertdwh.ru/ewh/expertisa:master
pull_policy: always pull_policy: always
volumes: restart: unless-stopped
- /opt/docker/eisa/master:/data deploy:
- /opt/docker/eisa/master-files:/data/uploaded-files replicas: 3
configs: configs:
- source: app_config - source: app_config
target: /data/application.yaml target: /data/application.yaml
@ -12,9 +12,12 @@ services:
labels: labels:
- "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)" - "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
- "traefik.http.routers.expertisa-master.tls=true" - "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"
- "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s" - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
environment:
JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
network_mode: bridge network_mode: bridge
configs: configs:
@ -22,7 +25,8 @@ configs:
content: | content: |
infinispan: infinispan:
embedded: embedded:
cluster-name: master enabled: true
cluster-name: eisa-master
eisa: eisa:
force-core-update: true force-core-update: true
metadata-git: metadata-git:
@ -30,6 +34,13 @@ configs:
branch: master branch: master
enabled: true enabled: true
token: ${GIT_TOKEN} token: ${GIT_TOKEN}
file-store-type: s3
s3:
endpoint: minio.app.expertdwh.ru
port: 9000
access-key: ZfyTrAp9tsxkvfyyEIbC
secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
bucket: master
db: db:
common-datasource-name: meta common-datasource-name: meta
jdbc: jdbc:
@ -41,6 +52,8 @@ configs:
url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
username: ewh username: ewh
password: ${EWH_PASSWORD} password: ${EWH_PASSWORD}
pre-script: core-postgresql.preScript
post-script: core-postgresql.postScript
EWH_ORA: EWH_ORA:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: ewh username: ewh
@ -49,12 +62,4 @@ configs:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: dwh username: dwh
password: ${DWH_PASSWORD} password: ${DWH_PASSWORD}
management:
endpoints:
web:
exposure:
include: '*'
jmx:
exposure:
include: '*'
audit.enabled: true audit.enabled: true