JCNC/LLMX
2
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

build(jib): 更新基础镜像并调整构建配置

Browse Source 
- 移除 build.gradle.kts 中的 netcat-openbsd 安装指令- 更新 JibProject 中的 baseImage 为 gewuyou/liberica-openjdk-debian-nc- 重新启用并修正 llmx-impl-openai 模块的名称
This commit is contained in:
gewuyou 2025-05-09 11:32:39 +08:00
parent 3bdbf42adf
commit 8ee99bb398
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -122,7 +122,6 @@ subprojects {
paths = listOf(File(rootProject.projectDir, "scripts").absolutePath) paths = listOf(File(rootProject.projectDir, "scripts").absolutePath)
entrypoint = listOf( entrypoint = listOf(
"/bin/sh", "-c", "/bin/sh", "-c",
"apt-get update && apt-get install -y netcat-openbsd && " +
"/entrypoint.sh -d llmx-nacos:8848 -c " + "/entrypoint.sh -d llmx-nacos:8848 -c " +
"'java -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file )'" "'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) paths = listOf(File(rootProject.projectDir, "scripts").absolutePath)
entrypoint = listOf( entrypoint = listOf(
"/bin/sh", "-c", "/bin/sh", "-c",
"apt-get update && apt-get install -y netcat-openbsd && " +
"/entrypoint.sh -d llmx-nacos:8848 -c " + "/entrypoint.sh -d llmx-nacos:8848 -c " +
"'java -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file )'" "'java -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file )'"
) )

2
buildSrc/src/main/kotlin/org/jcnc/llmx/plugin/jib/entity/JibProject.kt
View File

@ -23,7 +23,7 @@ data class JibProject(
var imageName: String = "", var imageName: String = "",
var version: String = "latest", var version: String = "latest",
var permissions: Map<String, String> = mapOf("/entrypoint.sh" to "755"), var permissions: Map<String, String> = mapOf("/entrypoint.sh" to "755"),
var baseImage: String = "docker://bellsoft/liberica-openjdk-debian:21" var baseImage: String = "docker://gewuyou/liberica-openjdk-debian-nc"
) { ) {
init { init {
if (imageName.isBlank()) { if (imageName.isBlank()) {

4
settings.gradle.kts
View File

@ -18,10 +18,10 @@ project(":llmx-core:llmx-core-common").name = "llmx-core-common"
include( include(
"llmx-impl", "llmx-impl",
":llmx-impl:llmx-impl-bailian", ":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-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( include(
"llmx-app", "llmx-app",