diff --git a/.idea/.name b/.idea/.name
index eed7e79..90876de 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-sample
\ No newline at end of file
+<%%RESERVED_NAME%%>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index d0fbba8..99cf051 100644
--- a/Jenkinsfile
+++ b/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}"
}
}
}
diff --git a/config/logback.xml b/config/logback.xml
new file mode 100644
index 0000000..1e07380
--- /dev/null
+++ b/config/logback.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ ${consoleEncoding}
+ %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n
+
+
+
+
+ logs/<%%RESERVED_NAME%%>.log
+ true
+ true
+
+ UTF-8
+ %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 40b03b4..ed1685c 100644
--- a/docker-compose.yml
+++ b/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-.rule=PathPrefix(`/stands/`)"
@@ -29,7 +37,10 @@ services:
- "traefik.http.routers.stand-.middlewares=stand--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
\ No newline at end of file
+ external: true
+ stand-<%%RESERVED_NAME%%>-network:
+ driver: bridge
\ No newline at end of file