You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by jo...@apache.org on 2022/07/03 06:41:32 UTC
[incubator-shenyu] branch master updated: [type: build] change dockerfile-maven-plugin to docker-maven-plugin (only integrated-test part) (#3652)
This is an automated email from the ASF dual-hosted git repository.
jooks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 6dc380c9a [type: build] change dockerfile-maven-plugin to docker-maven-plugin (only integrated-test part) (#3652)
6dc380c9a is described below
commit 6dc380c9a7fab1501e61338528c98bd365510870
Author: Jiageng <sk...@outlook.com>
AuthorDate: Sun Jul 3 14:41:25 2022 +0800
[type: build] change dockerfile-maven-plugin to docker-maven-plugin (only integrated-test part) (#3652)
---
pom.xml | 1 +
.../shenyu-integrated-test-alibaba-dubbo/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-apache-dubbo/pom.xml | 37 +++++++++++-----------
.../shenyu-integrated-test-combination/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-grpc/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-http/pom.xml | 31 +++++++++++-------
.../shenyu-integrated-test-https/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-motan/pom.xml | 31 +++++++++++-------
.../shenyu-integrated-test-sofa/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-spring-cloud/pom.xml | 30 +++++++++++-------
.../shenyu-integrated-test-websocket/pom.xml | 30 +++++++++++-------
11 files changed, 193 insertions(+), 117 deletions(-)
diff --git a/pom.xml b/pom.xml
index 038357074..43f31c57e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
<jaxb.api.version>2.3.1</jaxb.api.version>
<mail.version>1.6.2</mail.version>
<dockerfile-maven-plugin.version>1.4.6</dockerfile-maven-plugin.version>
+ <docker-maven-plugin.version>0.40.1</docker-maven-plugin.version>
<ojdbc8.version>19.3.0.0</ojdbc8.version>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<spring-cloud-netflix-ribbon.version>2.2.10.RELEASE</spring-cloud-netflix-ribbon.version>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/pom.xml
index 89886e748..31dc83e3c 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/pom.xml
@@ -74,6 +74,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-alibaba-dubbo</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-alibaba-dubbo</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-alibaba-dubbo</finalName>
<plugins>
@@ -96,24 +101,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-alibaba-dubbo</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-alibaba-dubbo</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-alibaba-dubbo</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-alibaba-dubbo</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/pom.xml
index 3994260d2..dd5075697 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/pom.xml
@@ -74,6 +74,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-apache-dubbo</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-apache-dubbo</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-apache-dubbo</finalName>
<plugins>
@@ -96,31 +101,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-apache-dubbo</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-apache-dubbo</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-apache-dubbo</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-apache-dubbo</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
index 323d3687e..aef1b42aa 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
@@ -190,6 +190,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-combination</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-combination</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-combination</finalName>
<plugins>
@@ -212,24 +217,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-combination</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-combination</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-combination</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-combination</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-grpc/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-grpc/pom.xml
index 102ea2581..6539d0ce0 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-grpc/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-grpc/pom.xml
@@ -47,6 +47,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-grpc</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-grpc</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-grpc</finalName>
<plugins>
@@ -68,24 +73,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-grpc</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-grpc</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-grpc</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-grpc</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-http/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-http/pom.xml
index bb12dca5a..7aeace73e 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-http/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-http/pom.xml
@@ -188,6 +188,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-http</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-http</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-http</finalName>
<plugins>
@@ -209,25 +214,29 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-http</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-http</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-http</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-http</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-https/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-https/pom.xml
index d484a5583..cf996e7e5 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-https/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-https/pom.xml
@@ -39,6 +39,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-https</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-https</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-https</finalName>
<plugins>
@@ -60,24 +65,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-https</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-https</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-https</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-https</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-motan/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-motan/pom.xml
index fcaee1d5e..282edc6a6 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-motan/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-motan/pom.xml
@@ -71,6 +71,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-motan</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-motan</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-motan</finalName>
<plugins>
@@ -92,25 +97,29 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-motan</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-motan</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-motan</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-motan</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
index cfe6e41cc..95423e7a1 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
@@ -85,6 +85,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-sofa</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-sofa</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-sofa</finalName>
<plugins>
@@ -106,24 +111,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-sofa</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-sofa</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-sofa</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-sofa</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
index 9e87b124d..ad39e7e50 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
@@ -71,6 +71,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-spring-cloud</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-spring-cloud</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-spring-cloud</finalName>
<plugins>
@@ -93,24 +98,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-spring-cloud</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-spring-cloud</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-spring-cloud</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-spring-cloud</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-websocket/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-websocket/pom.xml
index 6ffb36e92..594850a33 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-websocket/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-websocket/pom.xml
@@ -58,6 +58,11 @@
<profiles>
<profile>
<id>it</id>
+ <properties>
+ <docker.buildArg.APP_NAME>shenyu-integrated-test-websocket</docker.buildArg.APP_NAME>
+ <docker.image.tag.repo>apache/shenyu-integrated-test-websocket</docker.image.tag.repo>
+ <docker.image.tag.tagName>latest</docker.image.tag.tagName>
+ </properties>
<build>
<finalName>shenyu-integrated-test-websocket</finalName>
<plugins>
@@ -80,24 +85,27 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven-plugin.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <images>
+ <image>
+ <name>apache/shenyu-integrated-test-websocket</name>
+ <build>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
<executions>
<execution>
- <id>shenyu-integrated-test-websocket</id>
+ <id>start</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
- <configuration>
- <repository>apache/shenyu-integrated-test-websocket</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-integrated-test-websocket</APP_NAME>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>