diff --git a/docker-compose.yml b/docker-compose.yml index 3cf589e..6fcd049 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,13 @@ 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 + image: git.expertdwh.ru/ewh/expertisa:${BRANCH} configs: - source: app_config target: /data/application.yaml 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.interval=5s" + - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)" + - "traefik.http.routers.expertisa-${BRANCH}.tls=true" network_mode: bridge @@ -22,21 +16,16 @@ configs: content: | infinispan: embedded: - cluster-name: master + cluster-name: ${BRANCH} eisa: force-core-update: true metadata-git: url: https://git.expertdwh.ru/EWH/expert-isa-2-metadata - branch: master + branch: test enabled: true token: ${GIT_TOKEN} db: - common-datasource-name: meta jdbc: - meta: - url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master - username: ewh - password: ${EWH_PASSWORD} EWH: url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh username: ewh