Вернул updater к стендам

.idea/.name

@@ -1 +1 @@
-sample
+<%%RESERVED_NAME%%>

Jenkinsfile

@@ -45,8 +45,8 @@ pipeline {
                 sh "mkdir -p /docker-projects/${params.STAND_ID}/rdblogs"
                 
                 sh "cp -r build/distDockerCompose/* /docker-projects/${params.STAND_ID}/"
-
-                sh "cp build/rdbDocker5/ncore-<%%RESERVED_NAME%%>.fdb /docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb"
+                //Защита от случайного переписывания файла бд
+                sh "[ -f '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb' ] || cp build/rdbDocker5/ncore-<%%RESERVED_NAME%%>.fdb '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb'"
                 sh "chown -R :312 /docker-projects/${params.STAND_ID}"
                 sh "chmod -R g+w /docker-projects/${params.STAND_ID}"
                 script {
@@ -77,6 +77,13 @@ pipeline {
                         sh "docker tag ${rdbImage} ${lrdbImage}"
                         sh "docker push ${rdbImage}"
                         sh "docker push ${lrdbImage}"
+
+                        def udbImage = "<%%FACTORY_REGISTRY_IMAGE%%>-update-db:${env.VERSION}"
+                        def ludbImage = "<%%FACTORY_REGISTRY_IMAGE%%>-update-db:latest"
+                        sh "cd build/docker-tools/uD && docker build -t ${udbImage} ."
+                        sh "docker tag ${udbImage} ${ludbImage}"
+                        sh "docker push ${udbImage}"
+                        sh "docker push ${ludbImage}"
                     }
                 }
             }

config/logback.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <define name="consoleEncoding" class="biz.redsoft.util.logback.ConsoleEncoding"/>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <charset>${consoleEncoding}</charset>
+      <pattern>%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>logs/<%%RESERVED_NAME%%>.log</file>
+    <append>true</append>
+    <immediateFlush>true</immediateFlush>
+    <encoder>
+      <charset>UTF-8</charset>
+      <pattern>%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+    <appender-ref ref="FILE" />
+  </root>
+</configuration>

docker-compose.yml

@@ -13,13 +13,21 @@ services:
       - RDB__AuthServer=Legacy_Auth, Srp
       - RDB__AuthClient=Legacy_Auth, Srp
     networks:
-      - factory-network
+      - stand-<%%RESERVED_NAME%%>-network
+  update:
+    image: <%%FACTORY_REGISTRY_IMAGE%%>-update-db:latest
+    volumes:
+      - ./config/ncore-properties.xml:/tomcat/webapps/ROOT/WEB-INF/ncore-properties.xml:ro
+    networks:
+      - ncore-network
   core:
     image: <%%FACTORY_REGISTRY_IMAGE%%>:latest
     networks:
+      - stand-<%%RESERVED_NAME%%>-network
       - factory-network
     depends_on:
       - rdb
+      - update
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.stand-<STAND_ID>.rule=PathPrefix(`/stands/<STAND_ID>`)"
@@ -29,7 +37,10 @@ services:
       - "traefik.http.routers.stand-<STAND_ID>.middlewares=stand-<STAND_ID>-strip"
     volumes:
       - ./config/ncore-properties.xml:/tomcat/webapps/ROOT/WEB-INF/ncore-properties.xml:ro
+      - ./config/logback.xml:/tomcat/webapps/ROOT/WEB-INF/logback.xml:ro
       - ./logs:/tomcat/logs
 networks:
   factory-network:
-    external: true
+    external: true
+  stand-<%%RESERVED_NAME%%>-network:
+    driver: bridge