обновлён ci-cd для развёртывания на двух нодах и с постгре

This commit is contained in:
StepanDemin 2024-10-04 15:28:28 +03:00
parent 6e07280e96
commit d7ef3121e1

View File

@ -3,6 +3,8 @@ services:
image: git.expertdwh.ru/ewh/expertisa:${BRANCH} image: git.expertdwh.ru/ewh/expertisa:${BRANCH}
pull_policy: always pull_policy: always
restart: unless-stopped restart: unless-stopped
deploy:
replicas: 2
configs: configs:
- source: app_config - source: app_config
target: /data/application.yaml target: /data/application.yaml
@ -10,12 +12,34 @@ services:
labels: labels:
- "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)" - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
- "traefik.http.routers.expertisa-${BRANCH}.tls=true" - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
- "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
- "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
network_mode: bridge networks:
- expertisa-twonodes-postgresql
depends_on:
- psql
psql:
image: postgres:latest
environment:
POSTGRES_USER: "admin"
POSTGRES_PASSWORD: "admin"
POSTGRES_DB: "expertisa-metadata"
networks:
- expertisa-twonodes-postgresql
networks:
expertisa-twonodes-postgresql:
external: true
configs: configs:
app_config: app_config:
content: | content: |
infinispan:
embedded:
enabled: true
cluster-name: eisa-${BRANCH}
eisa: eisa:
force-core-update: true force-core-update: true
metadata-git: metadata-git:
@ -23,8 +47,20 @@ configs:
branch: ${BRANCH} branch: ${BRANCH}
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: psql
jdbc: jdbc:
psql:
url: jdbc:postgresql://psql:5432/expertisa-metadata
username: admin
password: admin
EWH: EWH:
url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
username: ewh username: ewh