From 0ea1736b0e9657eb7b43d7d5853db5eb11bd7cf4 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai.milan.moritz@googlemail.com>
Date: Fri, 22 May 2026 12:40:13 +0000
Subject: [PATCH] refactor: Docker-Build auf bootBuildImage (Cloud Native
 Buildpacks) umstellen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Maven nutzte das io.fabric8:docker-maven-plugin, Gradle kopierte das JAR
in ein target/-Verzeichnis für dasselbe Dockerfile.

Beide Build-Systeme nutzen jetzt bootBuildImage, das über Cloud Native
Buildpacks direkt aus dem Spring Boot Plugin heraus ein OCI-Image erzeugt:

  Maven:  mvn spring-boot:build-image
  Gradle: ./gradlew bootBuildImage

Vorteile:
- Kein Dockerfile nötig
- Beide Build-Systeme verwenden dieselbe Methode
- Image folgt automatisch Best Practices (non-root, layered JAR)
- jib-maven-plugin und gradle-git-properties waren bereits durch Rebase
  vorhanden; jib entfällt zugunsten des Spring-Boot-eigenen build-image

Außerdem: springBoot { buildInfo() } in Gradle ergänzt, analog zum
build-info-Goal des spring-boot-maven-plugin (bereits in Maven konfiguriert).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 build.gradle | 11 ++++-------
 pom.xml      | 29 +++++------------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/build.gradle b/build.gradle
index 91b1a161..73b76a85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '4.0.6'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'com.gorylenko.gradle-git-properties' version '2.4.2'
-	id 'com.google.cloud.tools.jib' version '3.4.5'
 }
 
 group = 'de.juplo.kafka'
@@ -46,12 +45,10 @@ tasks.named('test') {
 	useJUnitPlatform()
 }
 
-tasks.named('test') {
-	useJUnitPlatform()
+springBoot {
+	buildInfo()
 }
 
-jib {
-	from { image = 'eclipse-temurin:21-jre' }
-	to { image = "juplo/${project.name}:${project.version}" }
-	container { mainClass = 'de.juplo.kafka.ExampleProducer' }
+bootBuildImage {
+	imageName = "juplo/${project.name}:${project.version}"
 }
diff --git a/pom.xml b/pom.xml
index 3ab5c8c0..d10f6b85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,11 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <image>
+            <name>juplo/${project.artifactId}:${project.version}</name>
+          </image>
+        </configuration>
         <executions>
           <execution>
             <goals>
@@ -87,30 +92,6 @@
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>com.google.cloud.tools</groupId>
-        <artifactId>jib-maven-plugin</artifactId>
-        <version>3.4.5</version>
-        <configuration>
-          <from>
-            <image>eclipse-temurin:21-jre</image>
-          </from>
-          <to>
-            <image>juplo/${project.artifactId}:${project.version}</image>
-          </to>
-          <container>
-            <mainClass>de.juplo.kafka.ExampleProducer</mainClass>
-          </container>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>dockerBuild</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
-- 
2.39.5