обновлён ci-cd для развёртывания на двух нодах и с постгре
This commit is contained in:
		| @@ -3,6 +3,8 @@ services: | ||||
|     image: git.expertdwh.ru/ewh/expertisa:${BRANCH} | ||||
|     pull_policy: always | ||||
|     restart: unless-stopped | ||||
|     deploy: | ||||
|       replicas: 2 | ||||
|     configs: | ||||
|       - source: app_config | ||||
|         target: /data/application.yaml | ||||
| @@ -10,12 +12,34 @@ services: | ||||
|     labels: | ||||
|       - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)" | ||||
|       - "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: | ||||
|   app_config: | ||||
|     content: | | ||||
|       infinispan: | ||||
|         embedded: | ||||
|           enabled: true | ||||
|           cluster-name: eisa-${BRANCH} | ||||
|       eisa: | ||||
|         force-core-update: true | ||||
|         metadata-git: | ||||
| @@ -23,8 +47,20 @@ configs: | ||||
|           branch: ${BRANCH} | ||||
|           enabled: true | ||||
|           token: ${GIT_TOKEN} | ||||
|         #file-store-type: s3 | ||||
|         #s3: | ||||
|         #  endpoint: minio.app.expertdwh.ru | ||||
|         #  port: 9000 | ||||
|         #  access-key: ZfyTrAp9tsxkvfyyEIbC | ||||
|         #  secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37 | ||||
|         #  bucket: master | ||||
|         db: | ||||
|           common-datasource-name: psql | ||||
|           jdbc: | ||||
|             psql: | ||||
|               url: jdbc:postgresql://psql:5432/expertisa-metadata | ||||
|               username: admin | ||||
|               password: admin | ||||
|             EWH: | ||||
|               url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh | ||||
|               username: ewh | ||||
|   | ||||
		Reference in New Issue
	
	Block a user