изменён docker-compose.yml

.gitignore

@@ -1,3 +0,0 @@
-/.idea/misc.xml
-/.idea/vcs.xml
-/.idea/workspace.xml

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/expert-isa-2-cicd.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="18" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/expert-isa-2-cicd.iml" filepath="$PROJECT_DIR$/.idea/expert-isa-2-cicd.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

docker-compose.yml

@@ -1,28 +1,18 @@
 services:
   eisa:
-    image: git.expertdwh.ru/ewh/expertisa:${BRANCH}
+    image: git.expertdwh.ru/ewh/expertisa:master
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: ${REPLICAS:-1}
+      replicas: 2
-      resources:
-        limits:
-          cpus: '4.0'
-          memory: 4G
     configs:
       - source: app_config
         target: /data/application.yaml
-      - source: hikari
-        target: /data/hikari.properties
-    entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-cp", "/app.war", "org.springframework.boot.loader.launch.PropertiesLauncher"]
-
-    environment:
-      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
 
     labels:
-      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`(?i)${BRANCH}\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
       - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
-      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health/readiness"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
       - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
 
     networks:
@@ -31,21 +21,13 @@ services:
       - psql
 
   psql:
-    container_name: psql-${BRANCH}
+    image: postgres:latest
-    image: postgres:9.4
-    restart: unless-stopped
     environment:
       POSTGRES_USER: "admin"
       POSTGRES_PASSWORD: "admin"
       POSTGRES_DB: "expertisa-metadata"
     networks:
       - expertisa-twonodes-postgresql
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-
-volumes:
-  pgdata:
-    name: pgdata-${BRANCH}
 
 networks:
   expertisa-twonodes-postgresql:
@@ -56,23 +38,8 @@ configs:
     content: |
       infinispan:
         embedded:
-          ${REPLICAS:+enabled: true}
+          enabled: true
           cluster-name: eisa-${BRANCH}
-          stack: tunnel
-      spring:
-        mail:
-          host: smtp.yandex.ru
-          port: 465
-          username: expertisaewh@yandex.ru
-          password: ${NOTIFICATION_PASSWORD}
-          properties:
-            mail:
-              transport:
-                protocol: smtps
-              smtp:
-                auth: true
-                ssl:
-                  enable: true
       eisa:
         force-core-update: true
         metadata-git:
@@ -80,85 +47,32 @@ configs:
           branch: ${BRANCH}
           enabled: true
           token: ${GIT_TOKEN}
-        personal-tunes-git:
+        #file-store-type: s3
-          url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
+        #s3:
-          branch: ${BRANCH}
+        #  endpoint: minio.app.expertdwh.ru
-          enabled: true
+        #  port: 9000
-          token: ${GIT_TOKEN}
+        #  access-key: ZfyTrAp9tsxkvfyyEIbC
-        file-store-type: s3
+        #  secret-key: jurIHMBGQ54HLu0CXwLSDiahhT6JV6qwZTFhqO37
-        s3:
+        #  bucket: master
-          endpoint: minio.app.expertdwh.ru
-          port: 9000
-          access-key: Q13rej1S6TdtXKb5Fuw5
-          secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
-          bucket: dev
         db:
           common-datasource-name: psql
-          camunda-datasource-name: psql-camunda
           jdbc:
             psql:
-              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
+              url: jdbc:postgresql://psql:5432/expertisa-metadata
               username: admin
               password: admin
-              pool:
-                pool-name: psql
-                minimum-idle: 1
-                maximum-pool-size: 50
-            psql-camunda:
-              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
-              username: admin
-              password: admin
-              pool:
-                pool-name: psql-camunda
-                minimum-idle: 1
-                maximum-pool-size: 50
             EWH:
-              url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
+              url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-postgresql.preScript
               post-script: core-postgresql.postScript
-              pool:
-                pool-name: ewh
-                minimum-idle: 1
-                maximum-pool-size: 50
             EWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
               password: ${EWH_PASSWORD}
-              pre-script: core-oracle.preScript
-              pool:
-                pool-name: ewh_ora
-                minimum-idle: 1
-                maximum-pool-size: 50
             DWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
-              pre-script: core-oracle.preScript
+      audit.enabled: true
-              pool:
-                pool-name: dwh_ora
-                minimum-idle: 1
-                maximum-pool-size: 50
-            MSSQL:
-              url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
-              username: sa
-              password: ${EWH_PASSWORD}
-              pool:
-                pool-name: mssql
-                minimum-idle: 1
-                maximum-pool-size: 50
-            uwh:
-              url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true
-              username: uwh
-              password: uwh
-              pool:
-                pool-name: uwh
-                minimum-idle: 1
-                maximum-pool-size: 50
-      audit.enabled: true
-
-  hikari:
-    content: |
-      minimumIdle=0
-      maximumPoolSize=12