♻️ refactor(build): 更新构建配置，优化Docker镜像构建和发布流程

vnobo · Jul 26, 2024 · e313c67 · e313c67
1 parent 4f221d6
commit e313c67
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 46 deletions.
diff --git a/boot/auth-server/build.gradle b/boot/auth-server/build.gradle
@@ -6,24 +6,6 @@ plugins {
     id 'org.hibernate.orm' version '6.5.2.Final'
 }
 
-tasks.named("bootBuildImage") {
-    tags = ["${dockerPrefix}/${rootProject.name}-${project.name}:latest"]
-    imageName = ("${dockerPrefix}/${rootProject.name}-${project.name}:${project.version}")
-    environment = [
-            "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
-            "BPE_APPEND_JAVA_TOOL_OPTIONS": "-Dfile.encoding=UTF-8 " +
-                    "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
-    ]
-    publish = true
-    docker {
-        publishRegistry {
-            username = "${dockerUsername}"
-            password = "${dockerPassword}"
-            email = "${dockerEmail}"
-        }
-    }
-}
-
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)

diff --git a/boot/auth-server/gradle/wrapper/gradle-wrapper.jar b/boot/auth-server/gradle/wrapper/gradle-wrapper.jar
diff --git a/boot/auth-server/gradle/wrapper/gradle-wrapper.properties b/boot/auth-server/gradle/wrapper/gradle-wrapper.properties
diff --git a/boot/platform/build.gradle b/boot/platform/build.gradle
@@ -6,8 +6,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = '21'
-    targetCompatibility = '21'
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 configurations {
@@ -16,24 +17,6 @@ configurations {
     }
 }
 
-tasks.named("bootBuildImage") {
-    tags = ["${dockerPrefix}/${rootProject.name}-${project.name}:latest"]
-    imageName.set("${dockerPrefix}/${rootProject.name}-${project.name}:${project.version}")
-    environment = [
-            "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
-            "BPE_APPEND_JAVA_TOOL_OPTIONS": "-Dfile.encoding=UTF-8 " +
-                    "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
-    ]
-    publish = true
-    docker {
-        publishRegistry {
-            username = "${dockerUsername}"
-            password = "${dockerPassword}"
-            email = "${dockerEmail}"
-        }
-    }
-}
-
 dependencies {
 
     implementation("com.google.guava:guava:33.+")

diff --git a/boot/platform/src/main/resources/application-local.yml b/boot/platform/src/main/resources/application-local.yml
@@ -18,7 +18,7 @@ spring:
       max-idle-time: 10m
       validation-query: select 1
   sql.init:
-    mode: never
+    mode: always
     platform: postgres
     encoding: utf-8
   data.redis:

diff --git a/build.gradle b/build.gradle
@@ -30,4 +30,28 @@ configure(allprojects) { project ->
         resolutionStrategy.cacheChangingModulesFor 0, "minutes"
     }
 
+}
+
+configurations(subprojects) { project ->
+
+    apply plugin: "org.springframework.boot"
+
+    tasks.named("bootBuildImage") {
+        tags = ["${dockerPrefix}/${rootProject.name}-${project.name}:latest"]
+        imageName.set("${dockerPrefix}/${rootProject.name}-${project.name}:${project.version}")
+        environment = [
+                "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
+                "BPE_APPEND_JAVA_TOOL_OPTIONS": "-Dfile.encoding=UTF-8 " +
+                        "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
+        ]
+        publish = true
+        docker {
+            host = "//./pipe/dockerDesktopLinuxEngine"
+            publishRegistry {
+                username = "${dockerUsername}"
+                password = "${dockerPassword}"
+                email = "${dockerEmail}"
+            }
+        }
+    }
 }