From 8ee99bb398a3b6b8784507ee6878f815956aa402 Mon Sep 17 00:00:00 2001 From: gewuyou Date: Fri, 9 May 2025 11:32:39 +0800 Subject: [PATCH] =?UTF-8?q?build(jib):=20=E6=9B=B4=E6=96=B0=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E9=95=9C=E5=83=8F=E5=B9=B6=E8=B0=83=E6=95=B4=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 build.gradle.kts 中的 netcat-openbsd 安装指令- 更新 JibProject 中的 baseImage 为 gewuyou/liberica-openjdk-debian-nc- 重新启用并修正 llmx-impl-openai 模块的名称 --- build.gradle.kts | 2 -- .../main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt | 2 +- settings.gradle.kts | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9aef9e6..c6e85f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -122,7 +122,6 @@ subprojects { paths = listOf(File(rootProject.projectDir, "scripts").absolutePath) entrypoint = listOf( "/bin/sh", "-c", - "apt-get update && apt-get install -y netcat-openbsd && " + "/entrypoint.sh -d llmx-nacos:8848 -c " + "'java -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file )'" ) @@ -135,7 +134,6 @@ subprojects { paths = listOf(File(rootProject.projectDir, "scripts").absolutePath) entrypoint = listOf( "/bin/sh", "-c", - "apt-get update && apt-get install -y netcat-openbsd && " + "/entrypoint.sh -d llmx-nacos:8848 -c " + "'java -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file )'" ) diff --git a/buildSrc/src/main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt b/buildSrc/src/main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt index 35496c4..09e7ae2 100644 --- a/buildSrc/src/main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt +++ b/buildSrc/src/main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt @@ -23,7 +23,7 @@ data class JibProject( var imageName: String = "", var version: String = "latest", var permissions: Map = mapOf("/entrypoint.sh" to "755"), - var baseImage: String = "docker://bellsoft/liberica-openjdk-debian:21" + var baseImage: String = "docker://gewuyou/liberica-openjdk-debian-nc" ) { init { if (imageName.isBlank()) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 04461a1..68e41c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,10 +18,10 @@ project(":llmx-core:llmx-core-common").name = "llmx-core-common" include( "llmx-impl", ":llmx-impl:llmx-impl-bailian", -// "llmx-impl:llmx-impl-openAi", + "llmx-impl:llmx-impl-openai", ) project(":llmx-impl:llmx-impl-bailian").name = "llmx-impl-bailian" -//project(":llmx-impl:llmx-impl-openAi").name = "llmx-impl-openAi" +project(":llmx-impl:llmx-impl-openai").name = "llmx-impl-openai" include( "llmx-app",