minor

build.gradle

@@ -187,8 +187,8 @@ task distDockerCompose(type: Copy){
     from(project.file("config")){
         into "config"
     }
-    from(project.file("build/rdbDocker")){
-        into "db"
+    from(project.file("build/rdbDocker").listFiles().find {it.getName().endsWith(".fdb")}){
+        into "db/<%%FACTORY_REGISTRY_IMAGE%%>.fdb"
         exclude "Dockerfile"
     }
     into composeDir

config/firebird.conf

@@ -0,0 +1,5 @@
+AuthServer = Srp
+LdapLibrary = libldap.so.2
+AuthClient = Srp
+WireCrypt = Disabled
+UserManager = Srp

config/ncore-properties.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+  <comment>Configuration settings for ncore platform</comment>
+
+  <!-- Product settings -->
+  <entry key="product.name"><%%RESERVED_GROUPNAME%%></entry>
+  <entry key="product.subsystem"><%%RESERVED_NAME%%></entry>
+  <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
+
+  <!-- Database settings -->
+  <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>
+  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:/db/<%%RESERVED_NAME%%>.fdb?lc_ctype=WIN1251</entry>
+  <entry key="ncore.db.user">SYSDBA</entry>
+  <entry key="ncore.db.password">masterkey</entry>
+
+  <!-- Other settings -->
+  <entry key="security.cryptoapi.disable">yes</entry> <!-- Disable usage of cryptographic functions -->
+  <entry key="ncore.client.queryexit">yes</entry> <!-- Query before system exit -->
+</properties>

docker-compose.yml

@@ -2,40 +2,49 @@ version: "3"
 
 services:
   rdb:
+    container_name: <%%FACTORY_REGISTRY_IMAGE%%>-rdb
     image: <%%FACTORY_REGISTRY_IMAGE%%>-db:latest
-    # Если хочется свою базу (Обязательно для update)
-    #    volumes:
-    #      - /mydbpath:/fdb/insidepath.fdb
-    #    environment:
-    #       RDB_DATABASES__ncoredb: /fdb/insidepath.fdb
-
+    volumes:
+      - ./db/<%%FACTORY_REGISTRY_IMAGE%%>.fdb:/db/<%%FACTORY_REGISTRY_IMAGE%%>.fdb
+      - ./rdblogs:/logs
+      - ./config/firebird.conf:/opt/RedDatabase/firebird.conf
     # Если надо открыть порты для подключения к субд: Левый порт хоста, правый контейнера.
     #    ports:
     #      - "3050:3050"
     #      - "3051:3051"
+    environment:
+      - NO_EMPLOYEE=1
+      - RDB__WireCrypt=Disabled
+      - RDB__UserManager=Srp
+      - RDB__AuthServer=Srp
+      - RDB__AuthClient=Srp
     networks:
-      - ncore-network
+      - <%%FACTORY_REGISTRY_IMAGE%%>-network
     #Если надо пролить патчи
     #  update:
     #    image: <%%FACTORY_REGISTRY_IMAGE%%>-db-update:latest
     #    networks:
-    #      - ncore-network
+    #      - <%%FACTORY_REGISTRY_IMAGE%%>-network
     # Если надо добавить свой патч
   #    volumes:
   #      - /NCORE-0000045.xml:/ncore/updates/NCORE-0000045.xml
   #    environment:
   #      ncoredb: "localhost:<%%RESERVED_NAME%%>.dev"
   core:
+    container_name: <%%FACTORY_REGISTRY_IMAGE%%>-core
     image: <%%FACTORY_REGISTRY_IMAGE%%>:latest
     ports:
       # Левый порт хоста, правый контейнера
       - "9000:8080"
     networks:
-      - ncore-network
+      - <%%FACTORY_REGISTRY_IMAGE%%>-network
     depends_on:
       - rdb
+    volumes:
+      - ./config/ncore-properties.xml:/tomcat/webapps/ROOT/WEB-INF/ncore-properties.xml:ro
+      - ./logs:/tomcat/logs
 #      #Если перед запуском надо пролить патчи
 #      - update
 networks:
-  ncore-network:
-    driver: bridge
+  <%%FACTORY_REGISTRY_IMAGE%%>-network:
+    driver: bridge