From 9668674b361aa1b7b5e72c457fc0fa9d7b324f05 Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Tue, 14 May 2024 00:22:55 +0800
Subject: [PATCH] [improve][build] Improve docker-push (#22702)

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 docker/pulsar-all/pom.xml | 23 ++++-------------------
 docker/pulsar/pom.xml     | 23 ++++-------------------
 pom.xml                   |  1 +
 3 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index 3da14ea84bcb3..6aa783ee9c85f 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -146,6 +146,7 @@
                 <goals>
                   <goal>build</goal>
                   <goal>tag</goal>
+                  <goal>push</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -180,25 +181,9 @@
 
     <profile>
       <id>docker-push</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>build</goal>
-                  <goal>tag</goal>
-                  <goal>push</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <docker.skip.push>false</docker.skip.push>
+      </properties>
     </profile>
 
   </profiles>
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 79ff4bd33b10c..5d83c8b547759 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -73,6 +73,7 @@
                 <goals>
                   <goal>build</goal>
                   <goal>tag</goal>
+                  <goal>push</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -124,25 +125,9 @@
 
     <profile>
       <id>docker-push</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>build</goal>
-                  <goal>tag</goal>
-                  <goal>push</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <docker.skip.push>false</docker.skip.push>
+      </properties>
     </profile>
 
   </profiles>
diff --git a/pom.xml b/pom.xml
index 63b44788f1410..2254d6a187540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@ flexible messaging model and an intuitive client API.</description>
          To create multi-arch image, pass -Ddocker.platforms=linux/arm64,linux/amd64
     -->
     <docker.platforms></docker.platforms>
+    <docker.skip.push>true</docker.skip.push>
 
     <!-- required for running tests on JDK11+ -->
     <test.additional.args>