добавлено подключение к s3/dev

docker-compose.yml

@@ -1,46 +1,77 @@
 services:
   eisa:
-    image: git.expertdwh.ru/ewh/expertisa:master
+    image: git.expertdwh.ru/ewh/expertisa:${BRANCH}
     pull_policy: always
-    volumes:
+    restart: unless-stopped
-      - /opt/docker/eisa/master:/data
+    deploy:
-      - /opt/docker/eisa/master-files:/data/uploaded-files
+      replicas: 2
     configs:
       - source: app_config
         target: /data/application.yaml
 
     labels:
-      - "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
-      - "traefik.http.routers.expertisa-master.tls=true"
+      - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/actuator/health"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
-      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
+      - "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
+    volumes:
+      - pgdata-${BRANCH}:/var/lib/postgresql/data
+
+volumes:
+  pgdata-${BRANCH}:
+
+networks:
+  expertisa-twonodes-postgresql:
+    external: true
 
 configs:
   app_config:
     content: |
       infinispan:
         embedded:
-          cluster-name: master
+          enabled: true
+          cluster-name: eisa-${BRANCH}
       eisa:
         force-core-update: true
         metadata-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-metadata
-          branch: master
+          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: dev
         db:
-          common-datasource-name: meta
+          common-datasource-name: psql
           jdbc:
-            meta:
+            psql:
-              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
+              url: jdbc:postgresql://psql:5432/expertisa-metadata
-              username: ewh
+              username: admin
-              password: ${EWH_PASSWORD}
+              password: admin
             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
             EWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
@@ -49,12 +80,4 @@ configs:
               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