From df9cb6683c7adaf6fa879198148e12c77e504c94 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 2 Mar 2026 18:32:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B4=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- config/firebird.conf | 5 +++++ config/ncore-properties.xml | 20 ++++++++++++++++++++ docker-compose.yml | 31 ++++++++++++++++++++----------- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 config/firebird.conf create mode 100644 config/ncore-properties.xml diff --git a/build.gradle b/build.gradle index b168aec..b778b7a 100644 --- a/build.gradle +++ b/build.gradle @@ -188,7 +188,7 @@ task distDockerCompose(type: Copy){ into "config" } from(project.file("build/rdbDocker")){ - into "db" + into "db/<%%FACTORY_REGISTRY_IMAGE%%>.fdb" exclude "Dockerfile" } into composeDir diff --git a/config/firebird.conf b/config/firebird.conf new file mode 100644 index 0000000..701da60 --- /dev/null +++ b/config/firebird.conf @@ -0,0 +1,5 @@ +AuthServer = Srp +LdapLibrary = libldap.so.2 +AuthClient = Srp +WireCrypt = Disabled +UserManager = Srp \ No newline at end of file diff --git a/config/ncore-properties.xml b/config/ncore-properties.xml new file mode 100644 index 0000000..f320bc5 --- /dev/null +++ b/config/ncore-properties.xml @@ -0,0 +1,20 @@ + + + + Configuration settings for ncore platform + + + <%%RESERVED_GROUPNAME%%> + <%%RESERVED_NAME%%> + <%%RESERVED_NAME%%> ncore project + + + org.firebirdsql.jdbc.FBDriver + jdbc:firebirdsql:localhost:/db/<%%RESERVED_NAME%%>.fdb?lc_ctype=WIN1251 + SYSDBA + masterkey + + + yes + yes + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 81d61bf..bdf6a51 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file