Обновить docker-compose.yml

.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,64 +1,35 @@
 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: 3
       resources:
         limits:
-          cpus: '4.0'
-          memory: 4G
+          memory: 10G
     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]", "-jar", "/app.war"]
+
+    labels:
+      - "traefik.http.routers.expertisa-master.rule=HostRegexp(`master\\..+`)"
+      - "traefik.http.routers.expertisa-master.tls=true"
+      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.path=/health/readiness"
+      - "traefik.http.services.expertisa-master.loadbalancer.healthcheck.interval=5s"
 
     environment:
       JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
-
-    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/readiness"
-      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
-
-    networks:
-      - expertisa-twonodes-postgresql
-    depends_on:
-      - psql
-
-  psql:
-    container_name: psql-${BRANCH}
-    image: postgres:latest
-    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:
-    external: true
+      
+    network_mode: bridge
 
 configs:
   app_config:
     content: |
       infinispan:
         embedded:
-          ${REPLICAS:+enabled: true}
-          cluster-name: eisa-${BRANCH}
-          stack: tunnel
+          enabled: true
+          cluster-name: eisa-master
       spring:
         mail:
           host: smtp.yandex.ru
@@ -77,12 +48,7 @@ configs:
         force-core-update: true
         metadata-git:
           url: https://git.expertdwh.ru/EWH/expert-isa-2-metadata
-          branch: ${BRANCH}
-          enabled: true
-          token: ${GIT_TOKEN}
-        personal-tunes-git:
-          url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
-          branch: ${BRANCH}
+          branch: master
           enabled: true
           token: ${GIT_TOKEN}
         file-store-type: s3
@@ -91,46 +57,56 @@ configs:
           port: 9000
           access-key: Q13rej1S6TdtXKb5Fuw5
           secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
-          bucket: dev
+          bucket: master
         db:
-          common-datasource-name: psql
-          camunda-datasource-name: psql-camunda
+          common-datasource-name: meta
+          camunda-datasource-name: meta-camunda
           jdbc:
-            psql:
-              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
-              username: admin
-              password: admin
-            psql-camunda:
-              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
-              username: admin
-              password: admin
+            meta:
+              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
+              username: ewh
+              password: ${EWH_PASSWORD}
+              pool:
+                minimum-idle: 1
+                max-pool-size: 10
+            meta-camunda:
+              url: jdbc:postgresql://app.expertdwh.ru:5432/eisa-master
+              username: ewh
+              password: ${EWH_PASSWORD}
+              pool:
+                minimum-idle: 1
+                max-pool-size: 12
             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:
+                minimum-idle: 1
+                max-pool-size: 10
             EWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: ewh
               password: ${EWH_PASSWORD}
               pre-script: core-oracle.preScript
+              pool:
+                minimum-idle: 1
+                max-pool-size: 10
             DWH_ORA:
               url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
               username: dwh
               password: ${DWH_PASSWORD}
               pre-script: core-oracle.preScript
+              pool:
+                minimum-idle: 1
+                max-pool-size: 10
             MSSQL:
               url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
               username: sa
               password: ${EWH_PASSWORD}
-            uwh:
-              url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true
-              username: uwh
-              password: uwh
       audit.enabled: true
-
-  hikari:
-    content: |
-      minimumIdle=0
-      maximumPoolSize=12
+      logging:
+        level:
+          root: debug
+          ru.expertdwh: trace