This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 a5a6a09 fix #2113 (#2114)
a5a6a09 is described below
commit a5a6a0901cbe7305bd602353fe222c3c5a45fd7b
Author: babynata <[email protected]>
AuthorDate: Thu Sep 23 10:57:28 2021 +0800
fix #2113 (#2114)
Make the docker plugin alternative
---
.../workflows/integrated-test-alibaba-dubbo.yml | 2 +-
.github/workflows/integrated-test-apache-dubbo.yml | 2 +-
.github/workflows/integrated-test-grpc.yml | 2 +-
.github/workflows/integrated-test-http.yml | 2 +-
.github/workflows/integrated-test-spring-cloud.yml | 2 +-
.../shenyu-examples-alibaba-dubbo-service/pom.xml | 53 +++++++++++++--------
.../shenyu-examples-apache-dubbo-service/pom.xml | 53 +++++++++++++--------
shenyu-examples/shenyu-examples-grpc/pom.xml | 53 +++++++++++++--------
shenyu-examples/shenyu-examples-http/pom.xml | 54 +++++++++++++---------
.../shenyu-examples-springcloud/pom.xml | 53 +++++++++++++--------
10 files changed, 170 insertions(+), 106 deletions(-)
diff --git a/.github/workflows/integrated-test-alibaba-dubbo.yml
b/.github/workflows/integrated-test-alibaba-dubbo.yml
index f441f45..078c38e 100644
--- a/.github/workflows/integrated-test-alibaba-dubbo.yml
+++ b/.github/workflows/integrated-test-alibaba-dubbo.yml
@@ -54,7 +54,7 @@ jobs:
run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -Dmaven.test.skip=true
- name: Build examples
if: env.SKIP_CI != 'true'
- run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-dubbo/pom.xml
+ run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-dubbo/pom.xml -Pdocker
- name: Build integrated tests
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -DskipTests -f
./shenyu-integrated-test/pom.xml
diff --git a/.github/workflows/integrated-test-apache-dubbo.yml
b/.github/workflows/integrated-test-apache-dubbo.yml
index 69ee5eb..04f38ec 100644
--- a/.github/workflows/integrated-test-apache-dubbo.yml
+++ b/.github/workflows/integrated-test-apache-dubbo.yml
@@ -54,7 +54,7 @@ jobs:
run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -Dmaven.test.skip=true
- name: Build examples
if: env.SKIP_CI != 'true'
- run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-dubbo/pom.xml
+ run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-dubbo/pom.xml -Pdocker
- name: Build integrated tests
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -DskipTests -f
./shenyu-integrated-test/pom.xml
diff --git a/.github/workflows/integrated-test-grpc.yml
b/.github/workflows/integrated-test-grpc.yml
index ba10d51..3255bf6 100644
--- a/.github/workflows/integrated-test-grpc.yml
+++ b/.github/workflows/integrated-test-grpc.yml
@@ -54,7 +54,7 @@ jobs:
run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -Dmaven.test.skip=true
- name: Build examples
if: env.SKIP_CI != 'true'
- run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-grpc/pom.xml
+ run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-grpc/pom.xml -Pdocker
- name: Build integrated tests
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -DskipTests -f
./shenyu-integrated-test/pom.xml
diff --git a/.github/workflows/integrated-test-http.yml
b/.github/workflows/integrated-test-http.yml
index 409baf4..d82e8bf 100644
--- a/.github/workflows/integrated-test-http.yml
+++ b/.github/workflows/integrated-test-http.yml
@@ -54,7 +54,7 @@ jobs:
run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -Dmaven.test.skip=true
- name: Build examples
if: env.SKIP_CI != 'true'
- run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-http/pom.xml
+ run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-http/pom.xml -Pdocker
- name: Build integrated tests
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -DskipTests -f
./shenyu-integrated-test/pom.xml
diff --git a/.github/workflows/integrated-test-spring-cloud.yml
b/.github/workflows/integrated-test-spring-cloud.yml
index d3afa12..3163ada 100644
--- a/.github/workflows/integrated-test-spring-cloud.yml
+++ b/.github/workflows/integrated-test-spring-cloud.yml
@@ -54,7 +54,7 @@ jobs:
run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -Dmaven.test.skip=true
- name: Build examples
if: env.SKIP_CI != 'true'
- run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-springcloud/pom.xml
+ run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-springcloud/pom.xml -Pdocker
- name: Build eureka
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -DskipTests -f
./shenyu-examples/shenyu-examples-eureka/pom.xml
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
index e3d5e13..dcf1e52 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
@@ -130,26 +130,39 @@
<executable>true</executable>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
- <executions>
- <execution>
- <id>shenyu-examples-alibaba-dubbo-service</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<repository>shenyu-examples-alibaba-dubbo-service</repository>
- <tag>latest</tag>
- <buildArgs>
-
<APP_NAME>shenyu-examples-alibaba-dubbo-service</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <executions>
+ <execution>
+ <id>shenyu-examples-alibaba-dubbo-service</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<repository>shenyu-examples-alibaba-dubbo-service</repository>
+ <tag>latest</tag>
+ <buildArgs>
+
<APP_NAME>shenyu-examples-alibaba-dubbo-service</APP_NAME>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
index cd831a5..44dfee0 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
@@ -145,26 +145,39 @@
<executable>true</executable>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
- <executions>
- <execution>
- <id>shenyu-examples-apache-dubbo-service</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<repository>shenyu-examples-apache-dubbo-service</repository>
- <tag>latest</tag>
- <buildArgs>
-
<APP_NAME>shenyu-examples-apache-dubbo-service</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <executions>
+ <execution>
+ <id>shenyu-examples-apache-dubbo-service</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<repository>shenyu-examples-apache-dubbo-service</repository>
+ <tag>latest</tag>
+ <buildArgs>
+
<APP_NAME>shenyu-examples-apache-dubbo-service</APP_NAME>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shenyu-examples/shenyu-examples-grpc/pom.xml
b/shenyu-examples/shenyu-examples-grpc/pom.xml
index 35a484f..350b58a 100644
--- a/shenyu-examples/shenyu-examples-grpc/pom.xml
+++ b/shenyu-examples/shenyu-examples-grpc/pom.xml
@@ -108,26 +108,39 @@
<executable>true</executable>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
- <executions>
- <execution>
- <id>shenyu-examples-grpc</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repository>shenyu-examples-grpc</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-examples-grpc</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <executions>
+ <execution>
+ <id>shenyu-examples-grpc</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>shenyu-examples-grpc</repository>
+ <tag>latest</tag>
+ <buildArgs>
+ <APP_NAME>shenyu-examples-grpc</APP_NAME>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shenyu-examples/shenyu-examples-http/pom.xml
b/shenyu-examples/shenyu-examples-http/pom.xml
index 2ea7a27..ab627eb 100644
--- a/shenyu-examples/shenyu-examples-http/pom.xml
+++ b/shenyu-examples/shenyu-examples-http/pom.xml
@@ -82,27 +82,39 @@
<executable>true</executable>
</configuration>
</plugin>
-
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
- <executions>
- <execution>
- <id>shenyu-examples-http</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repository>shenyu-examples-http</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-examples-http</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <executions>
+ <execution>
+ <id>shenyu-examples-http</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>shenyu-examples-http</repository>
+ <tag>latest</tag>
+ <buildArgs>
+ <APP_NAME>shenyu-examples-http</APP_NAME>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/shenyu-examples/shenyu-examples-springcloud/pom.xml
b/shenyu-examples/shenyu-examples-springcloud/pom.xml
index 74b17d9..f36363c 100644
--- a/shenyu-examples/shenyu-examples-springcloud/pom.xml
+++ b/shenyu-examples/shenyu-examples-springcloud/pom.xml
@@ -87,26 +87,39 @@
<executable>true</executable>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
- <executions>
- <execution>
- <id>shenyu-examples-springcloud</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repository>shenyu-examples-springcloud</repository>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>shenyu-examples-springcloud</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <executions>
+ <execution>
+ <id>shenyu-examples-springcloud</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<repository>shenyu-examples-springcloud</repository>
+ <tag>latest</tag>
+ <buildArgs>
+
<APP_NAME>shenyu-examples-springcloud</APP_NAME>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
