Use Spring Boots way of building optimized images

kir-dev · Nov 7, 2024 · ad0fe20 · ad0fe20
1 parent 6739b87
commit ad0fe20
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/build-candidate.yml b/.github/workflows/build-candidate.yml
@@ -25,17 +25,14 @@ jobs:
           java-version: 21
           distribution: temurin
 
-      - name: Gradle CI
+      - name: Build OCI Image
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: clean bootBuildImage --imageName=${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:rc
           build-root-directory: backend
 
-      - name: Build and Push Docker Image
-        run: |
-          docker buildx create --use
-          docker buildx inspect --bootstrap
-          docker buildx build --platform linux/amd64 --push -t ${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:rc -f ./backend/Dockerfile ./backend
+      - name: Push OCI Image
+        run: docker push ${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:rc
 
       - name: Logout from Docker Registry
         run: docker logout ${{ secrets.DOCKER_REGISTRY_URL }}
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -25,17 +25,14 @@ jobs:
           java-version: 21
           distribution: temurin
 
-      - name: Gradle CI
+      - name: Build OCI Image
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: clean bootBuildImage --imageName=${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:release
           build-root-directory: backend
 
-      - name: Build and Push Docker Image
-        run: |
-          docker buildx create --use
-          docker buildx inspect --bootstrap
-          docker buildx build --platform linux/amd64 --push -t ${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:release -f ./backend/Dockerfile ./backend
+      - name: Push OCI Image
+        run: docker push ${{ secrets.DOCKER_REGISTRY_URL }}/cmsch:release
 
       - name: Logout from Docker Registry
         run: docker logout ${{ secrets.DOCKER_REGISTRY_URL }}
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -88,6 +88,16 @@ tasks.withType<KotlinCompile> {
     }
 }
 
+tasks.getByName<org.springframework.boot.gradle.tasks.bundling.BootBuildImage>("bootBuildImage") {
+    builder = "paketobuildpacks/builder-jammy-tiny"
+    environment = mapOf(
+        "BP_NATIVE_IMAGE" to "false",
+        "CDS_TRAINING_JAVA_TOOL_OPTIONS" to "-Dspring.profiles.include=prewarm",
+        "BP_JVM_CDS_ENABLED" to "true",
+        "BPL_JVM_THREAD_COUNT" to "25"
+    )
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }