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

(cherry picked from commit b1f05c3fe4)

.gitignore

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

.idea/.gitignore

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

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

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,6 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

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

docker-compose.yml

@@ -1,18 +1,32 @@
 services:
   eisa:
-    image: git.expertdwh.ru/ewh/expertisa:master
+    image: git.expertdwh.ru/ewh/expertisa:${BRANCH}
     pull_policy: always
     restart: unless-stopped
     deploy:
-      replicas: 2
+      replicas: ${REPLICAS:-1}
+      resources:
+        limits:
+          cpus: '4.0'
+          memory: 4G
     configs:
       - source: app_config
         target: /data/application.yaml
+    volumes:
+      - /opt/docker/eisa/lib:/data/lib:ro
+    #entrypoint: ["java", "-Deisa.branch=${BRANCH}", "-cp", "/app.war", "org.springframework.boot.loader.launch.PropertiesLauncher"]
+    command: ["-Deisa.branch=${BRANCH}"]
+
+    environment:
+      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=75 -Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]"
+
+    env_file:
+      - stack.env
 
     labels:
-      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`${BRANCH}\\..+`)"
+      - "traefik.http.routers.expertisa-${BRANCH}.rule=HostRegexp(`(?i)^${BRANCH}\\..+`)"
       - "traefik.http.routers.expertisa-${BRANCH}.tls=true"
-      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health"
+      - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.path=/health/readiness"
       - "traefik.http.services.expertisa-${BRANCH}.loadbalancer.healthcheck.interval=5s"
 
     networks:
@@ -21,13 +35,25 @@ services:
       - psql
 
   psql:
-    image: postgres:latest
+    container_name: psql-${BRANCH}
+    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
+    labels:
+      - "traefik.tcp.routers.pg-${BRANCH}.entrypoints=pg"
+      - "traefik.tcp.routers.pg-${BRANCH}.tls=true"
+      - "traefik.tcp.routers.pg-${BRANCH}.rule=HostSNIRegexp(`(?i)^${BRANCH}\\..+`)"
+
+volumes:
+  pgdata:
+    name: pgdata-${BRANCH}
 
 networks:
   expertisa-twonodes-postgresql:
@@ -38,8 +64,23 @@ configs:
     content: |
       infinispan:
         embedded:
-          enabled: true
-          cluster-name: eisa-${BRANCH}
+          ${REPLICAS:+enabled: true}
+          ${REPLICAS:+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:
@@ -47,32 +88,157 @@ 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
+          branches:
+            enabled: true
+            protect-main-branch-merge: false
+        personal-tunes-git:
+          url: https://git.expertdwh.ru/EWH/expert-isa-2-personal-tunes
+          branch: ${BRANCH}
+          enabled: true
+          token: ${GIT_TOKEN}
+        file-store-type: s3
+        s3:
+          endpoint: minio.app.expertdwh.ru
+          port: 9000
+          access-key: Q13rej1S6TdtXKb5Fuw5
+          secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
+          bucket: dev
+        file-store:
+          smb:
+            name: share
+            access: all
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share
+              username: ewh
+              password: admin
+          smb2:
+            name: share2
+            access: load
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share2
+              username: ewh2
+              password: admin
+          smb2-save:
+            name: share2-save
+            access: save
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share2
+              username: ewh2
+              password: admin
+          empty:
+            name: empty user
+            access: all
+            type: smb
+            smb:
+              server: ewh-rd.expertdwh.ru
+              path: share
+          tmp:
+            name: Временное
+            access: all
+            type: s3
+            flush:
+              enabled: true
+              schedule: 0 */10 * * * *
+              depth: 1w
+            s3:
+              endpoint: minio.app.expertdwh.ru
+              port: 9000
+              access-key: Q13rej1S6TdtXKb5Fuw5
+              secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
+              bucket: i-1243-1
+          tmp2:
+            name: Временное 2
+            access: save
+            type: s3
+            flush:
+              enabled: true
+              schedule: 0 */20 * * * *
+              depth: 1w
+            s3:
+              endpoint: minio.app.expertdwh.ru
+              port: 9000
+              access-key: Q13rej1S6TdtXKb5Fuw5
+              secret-key: ArYgb17ovZZutEgxZnIqNKq1h6DfNt7CN5zeiQXg
+              bucket: i-1243-2
+          s3-ll:
+            name: S3 длительного хранения
+            access: load
+            type: s3
+            s3:
+              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:5432/expertisa-metadata
+              url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
               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
+              url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
               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: oracle-utils.session-init
+              post-script: oracle-utils.session-clear
+              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