From b43e42ed3ada19099fa14f51833161c4aa42f964 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Fri, 19 Jun 2026 12:18:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20distDock?= =?UTF-8?q?erCompose=20=D0=B2=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20=D1=81=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=20gradle-nc?= =?UTF-8?q?ore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 ++- gradle.properties | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bba823a..9b7423e 100644 --- a/build.gradle +++ b/build.gradle @@ -176,7 +176,8 @@ task distDockerCompose(type: Copy){ from(project.file("config")){ into "config" } - from(project.file("build/rdbDocker").listFiles().find {it.getName().endsWith(".fdb")}){ + def dbDir = project.properties['docker.dbDir'] + from(project.file("build/rdbDocker${dbDir ? "/${dbDir.toString()}" : ""}").listFiles().find {it.getName().endsWith(".fdb")}){ into "db/<%%RESERVED_NAME%%>.fdb" exclude "Dockerfile" } diff --git a/gradle.properties b/gradle.properties index 20063d4..6f717cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,6 @@ org.gradle.java.home=/home/jenkins/.sdkman/candidates/java/current org.gradle.configureondemand=true pluginVersion=3.1.21 biz.redsoft.public.repo=https://nexus.red-soft.ru/repository/public -biz.redsoft.private.repo=https://nexus.red-soft.ru/repository/releases \ No newline at end of file +biz.redsoft.private.repo=https://nexus.red-soft.ru/repository/releases +docker.rdbversion = 5.2.1 +docker.dbDir = 5 \ No newline at end of file