Merge remote-tracking branch 'origin/docker-bd' into leng_dev_wx

pigx-auth/pom.xml

@@ -119,6 +119,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-common/pigx-common-bom/pom.xml

@@ -192,6 +192,15 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- nothing to do, but we need this to run docker:build form project root -->
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.32.0</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	

pigx-gateway/pom.xml

@@ -105,6 +105,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-register/pom.xml

@@ -80,6 +80,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 		<resources>

pigx-upms/pigx-upms-biz/pom.xml

@@ -123,6 +123,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-codegen/pom.xml

@@ -105,6 +105,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-daemon-elastic-job/pom.xml

@@ -106,6 +106,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-daemon-quartz/pom.xml

@@ -95,6 +95,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-monitor/pom.xml

@@ -93,6 +93,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-mp-platform/pom.xml

@@ -99,6 +99,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-oa-platform/pom.xml

@@ -161,6 +161,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 		<resources>

pigx-visual/pigx-pay-platform/pom.xml

@@ -115,6 +115,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pigx-visual/pigx-sentinel-dashboard/pom.xml

@@ -103,6 +103,9 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pom.xml

@@ -58,6 +58,8 @@
 		<docker.username>admin</docker.username>
 		<docker.password>Harbor12345</docker.password>
 		<docker.plugin.version>0.32.0</docker.plugin.version>
+		<!--  默认忽略docker构建 -->
+		<docker.skip>true</docker.skip>
 	</properties>
 
 	<dependencies>