Revert "fix: try to fix packaging"

This reverts commit 920dcc7.
bayang · Apr 20, 2024 · 6f019ed · 6f019ed
1 parent 920dcc7
commit 6f019ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -122,6 +122,17 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
+// unpack Spring Boot's fat jar for better Docker image layering
+tasks.register<JavaExec>("unpack") {
+    dependsOn(tasks.bootJar)
+    classpath = files(tasks.bootJar)
+    jvmArgs = listOf("-Djarmode=layertools")
+    args = "extract --destination ${layout.buildDirectory.get()}/dependency".split(" ")
+    doFirst {
+        delete("${layout.buildDirectory.get()}/dependency")
+    }
+}
+
 node {
     nodeProjectDir.set(file("${project.projectDir}/src/jelu-ui"))
     version.set("18.18.2")

diff --git a/ci/prepare-dockerhub.sh b/ci/prepare-dockerhub.sh
@@ -5,6 +5,9 @@
 
 source "$(dirname "$0")/docker-common.sh" $1 $2
 
+# Unpack fat jar
+./gradlew unpack
+
 # Build docker images (no push)
 docker buildx build \
     --platform $PLATFORMS \