From e3c92422f0a6ed596051c5c81612f641e3e070d0 Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 21 May 2025 15:50:31 +0800
Subject: [PATCH 1/5] [improve][build] Use project version with commit hash as
 docker tag

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 docker/pulsar-all/pom.xml                        | 6 +-----
 docker/pulsar/pom.xml                            | 5 -----
 pom.xml                                          | 3 +--
 tests/docker-images/java-test-image/pom.xml      | 3 +--
 tests/docker-images/latest-version-image/pom.xml | 3 +--
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index f040a930ed538..bace9af58964d 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -157,14 +157,10 @@
                       <name>${docker.organization}/${docker.image}-all:${docker.tag}</name>
                       <build>
                         <contextDir>${project.basedir}</contextDir>
-                        <skipTag>${docker.skip.tag}</skipTag>
-                        <tags>
-                          <tag>${project.version}-${git.commit.id.abbrev}</tag>
-                        </tags>
                         <args>
                           <PULSAR_IO_DIR>target/apache-pulsar-io-connectors-${project.version}-bin</PULSAR_IO_DIR>
                           <PULSAR_OFFLOADER_TARBALL>target/pulsar-offloader-distribution-${project.version}-bin.tar.gz</PULSAR_OFFLOADER_TARBALL>
-                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
                           <PULSAR_IO_KINESIS_KPL_IMAGE>${PULSAR_IO_KINESIS_KPL_IMAGE}</PULSAR_IO_KINESIS_KPL_IMAGE>
                         </args>
                         <buildx>
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 040d96ded8f2d..1441f41370f8d 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -86,10 +86,6 @@
                           <IMAGE_JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
                         </args>
                         <contextDir>${project.basedir}</contextDir>
-                        <skipTag>${docker.skip.tag}</skipTag>
-                        <tags>
-                          <tag>${project.version}-${git.commit.id.abbrev}</tag>
-                        </tags>
                         <buildx>
                           <platforms>
                             <platform>${docker.platforms}</platform>
@@ -127,7 +123,6 @@
       <id>docker-push</id>
       <properties>
         <docker.skip.push>false</docker.skip.push>
-        <docker.skip.tag>true</docker.skip.tag>
         <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
       </properties>
     </profile>
diff --git a/pom.xml b/pom.xml
index b846a7a7ccb3b..cde6193adcd0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@ flexible messaging model and an intuitive client API.</description>
     -->
     <docker.platforms></docker.platforms>
     <docker.skip.push>true</docker.skip.push>
-    <docker.skip.tag>false</docker.skip.tag>
 
     <!-- required for running tests on JDK11+ -->
     <test.additional.args>
@@ -167,7 +166,7 @@ flexible messaging model and an intuitive client API.</description>
     <surefire.shutdown>kill</surefire.shutdown>
     <docker.organization>apachepulsar</docker.organization>
     <docker.image>pulsar</docker.image>
-    <docker.tag>latest</docker.tag>
+    <docker.tag>${project.version}-${git.commit.id.abbrev}</docker.tag>
     <skipSourceReleaseAssembly>false</skipSourceReleaseAssembly>
     <skipBuildDistribution>false</skipBuildDistribution>
     <skipDeployConnector>false</skipDeployConnector>
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 3d265d37dba61..4085e8a37c514 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -152,7 +152,6 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -160,7 +159,7 @@
                       <name>${docker.organization}/java-test-image:${docker.tag}</name>
                       <build>
                         <args>
-                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
                         </args>
                         <contextDir>${project.basedir}</contextDir>
                         <noCache>true</noCache>
diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml
index 29108e529b771..0339fb84c87c0 100644
--- a/tests/docker-images/latest-version-image/pom.xml
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -156,7 +156,6 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -165,7 +164,7 @@
                       <build>
                         <contextDir>${project.basedir}</contextDir>
                         <args>
-                          <PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${project.version}-${git.commit.id.abbrev}</PULSAR_ALL_IMAGE>
+                          <PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${docker.tag}</PULSAR_ALL_IMAGE>
                         </args>
                         <noCache>true</noCache>
                         <buildx>

From 5d85fd3fa39ad3737aada780d23249aba4a8bee2 Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 21 May 2025 16:41:41 +0800
Subject: [PATCH 2/5] Remove git-commit-id-no-git profile

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 docker/pulsar-all/pom.xml | 11 -----------
 docker/pulsar/pom.xml     | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index bace9af58964d..9d4a4e53df9b0 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -66,17 +66,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>git-commit-id-no-git</id>
-      <activation>
-        <file>
-          <missing>${basedir}/../../.git</missing>
-        </file>
-      </activation>
-      <properties>
-        <git.commit.id.abbrev>no-git</git.commit.id.abbrev>
-      </properties>
-    </profile>
     <profile>
       <id>docker</id>
       <!-- include the docker image only when docker profile is active -->
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 1441f41370f8d..43f11fbefbb06 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -48,17 +48,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>git-commit-id-no-git</id>
-      <activation>
-        <file>
-          <missing>${basedir}/../../.git</missing>
-        </file>
-      </activation>
-      <properties>
-        <git.commit.id.abbrev>no-git</git.commit.id.abbrev>
-      </properties>
-    </profile>
     <profile>
       <id>docker</id>
       <build>

From 17550e5f6e1d7aa41baa20d45add30c3414afaba Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 21 May 2025 16:41:57 +0800
Subject: [PATCH 3/5] Add comment for git.commit.id.abbrev

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index cde6193adcd0e..4bbb173fabbd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,7 @@ flexible messaging model and an intuitive client API.</description>
     <surefire.shutdown>kill</surefire.shutdown>
     <docker.organization>apachepulsar</docker.organization>
     <docker.image>pulsar</docker.image>
+    <!-- git.commit.id.abbrev will be injected by git-commit-id-plugin-->
     <docker.tag>${project.version}-${git.commit.id.abbrev}</docker.tag>
     <skipSourceReleaseAssembly>false</skipSourceReleaseAssembly>
     <skipBuildDistribution>false</skipBuildDistribution>

From f0a4704712d26b2cb047f64826797f2556a0675c Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 4 Jun 2025 16:00:31 +0800
Subject: [PATCH 4/5] Move git-commit-id-no-git to the root project

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4bbb173fabbd2..1afb724c68f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2410,6 +2410,17 @@ flexible messaging model and an intuitive client API.</description>
   </build>
 
   <profiles>
+    <profile>
+      <id>git-commit-id-no-git</id>
+      <activation>
+        <file>
+          <missing>${basedir}/../../.git</missing>
+        </file>
+      </activation>
+      <properties>
+        <docker.tag>${project.version}-no-git</docker.tag>
+      </properties>
+    </profile>
     <profile>
       <!-- used for running integration tests on Java 8 -->
       <id>integration-test-java8</id>

From e2432b30769c702a56cc8121527515503aecd431 Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 4 Jun 2025 16:01:43 +0800
Subject: [PATCH 5/5] Fix missing check

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1afb724c68f96..a6b7bfba51085 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2414,7 +2414,7 @@ flexible messaging model and an intuitive client API.</description>
       <id>git-commit-id-no-git</id>
       <activation>
         <file>
-          <missing>${basedir}/../../.git</missing>
+          <missing>${basedir}/.git</missing>
         </file>
       </activation>
       <properties>