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 68bbc7d feature(shenyu-integrated-test): change shenyu-admin image
version to latest (#2332)
68bbc7d is described below
commit 68bbc7d6d97185b0dbe5ad4514bbe17ba65d32da
Author: luoxiaolong <[email protected]>
AuthorDate: Tue Nov 16 11:22:10 2021 +0800
feature(shenyu-integrated-test): change shenyu-admin image version to
latest (#2332)
---
pom.xml | 1 +
shenyu-dist/shenyu-admin-dist/pom.xml | 21 ++++++++++++++++-----
shenyu-dist/shenyu-bootstrap-dist/pom.xml | 2 +-
shenyu-examples/pom.xml | 1 +
.../shenyu-examples-alibaba-dubbo-service/pom.xml | 2 +-
.../shenyu-examples-apache-dubbo-service/pom.xml | 2 +-
shenyu-examples/shenyu-examples-eureka/pom.xml | 2 +-
shenyu-examples/shenyu-examples-grpc/pom.xml | 2 +-
shenyu-examples/shenyu-examples-http/pom.xml | 2 +-
.../shenyu-examples-motan-service/pom.xml | 2 +-
.../shenyu-examples-sofa-service/pom.xml | 2 +-
shenyu-examples/shenyu-examples-websocket/pom.xml | 2 +-
shenyu-integrated-test/pom.xml | 1 -
.../docker-compose.yml | 2 +-
.../shenyu-integrated-test-grpc/docker-compose.yml | 2 +-
.../shenyu-integrated-test-http/docker-compose.yml | 2 +-
.../shenyu-integrated-test-motan/docker-compose.yml | 2 +-
.../shenyu-integrated-test-sofa/docker-compose.yml | 2 +-
.../docker-compose.yml | 2 +-
.../docker-compose.yml | 2 +-
.../docker-compose.yml | 2 +-
.../docker-compose.yml | 2 +-
22 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index c246d1b..7e4e0ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<jaxb.api.version>2.3.0</jaxb.api.version>
<spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
<netflix-ribbon.version>2.2.9.RELEASE</netflix-ribbon.version>
+
<dockerfile-maven-plugin.version>1.4.6</dockerfile-maven-plugin.version>
</properties>
<dependencyManagement>
diff --git a/shenyu-dist/shenyu-admin-dist/pom.xml
b/shenyu-dist/shenyu-admin-dist/pom.xml
index 6456341..00409f9 100644
--- a/shenyu-dist/shenyu-admin-dist/pom.xml
+++ b/shenyu-dist/shenyu-admin-dist/pom.xml
@@ -33,7 +33,7 @@
<artifactId>shenyu-admin</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -44,7 +44,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -100,18 +100,29 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
- <id>shenyu-admin</id>
+ <id>tag-latest</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>latest</tag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-version</id>
<goals>
<goal>build</goal>
</goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>apache/shenyu-admin</repository>
- <tag>${project.version}</tag>
<buildArgs>
<APP_NAME>apache-shenyu-incubating-${project.version}-admin-bin</APP_NAME>
</buildArgs>
diff --git a/shenyu-dist/shenyu-bootstrap-dist/pom.xml
b/shenyu-dist/shenyu-bootstrap-dist/pom.xml
index 7ce3944..a29655b 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/pom.xml
+++ b/shenyu-dist/shenyu-bootstrap-dist/pom.xml
@@ -93,7 +93,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-bootstrap</id>
diff --git a/shenyu-examples/pom.xml b/shenyu-examples/pom.xml
index 77d1249..7e449a1 100644
--- a/shenyu-examples/pom.xml
+++ b/shenyu-examples/pom.xml
@@ -36,6 +36,7 @@
<shenyu.version>2.4.2-SNAPSHOT</shenyu.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
+
<dockerfile-maven-plugin.version>1.4.6</dockerfile-maven-plugin.version>
</properties>
<modules>
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 95acf53..33e61f5 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
@@ -141,7 +141,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-alibaba-dubbo-service</id>
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 21e45aa..c79660e 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
@@ -156,7 +156,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-apache-dubbo-service</id>
diff --git a/shenyu-examples/shenyu-examples-eureka/pom.xml
b/shenyu-examples/shenyu-examples-eureka/pom.xml
index 320e536..4b41352 100644
--- a/shenyu-examples/shenyu-examples-eureka/pom.xml
+++ b/shenyu-examples/shenyu-examples-eureka/pom.xml
@@ -106,7 +106,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-eureka</id>
diff --git a/shenyu-examples/shenyu-examples-grpc/pom.xml
b/shenyu-examples/shenyu-examples-grpc/pom.xml
index 350b58a..f7f00b0 100644
--- a/shenyu-examples/shenyu-examples-grpc/pom.xml
+++ b/shenyu-examples/shenyu-examples-grpc/pom.xml
@@ -122,7 +122,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-grpc</id>
diff --git a/shenyu-examples/shenyu-examples-http/pom.xml
b/shenyu-examples/shenyu-examples-http/pom.xml
index ab627eb..e709068 100644
--- a/shenyu-examples/shenyu-examples-http/pom.xml
+++ b/shenyu-examples/shenyu-examples-http/pom.xml
@@ -96,7 +96,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-http</id>
diff --git
a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
index c975e10..c0b4702 100644
---
a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
+++
b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
@@ -80,7 +80,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-motan</id>
diff --git
a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
index 370e7da..ea547a5 100644
--- a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
@@ -99,7 +99,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-sofa</id>
diff --git a/shenyu-examples/shenyu-examples-websocket/pom.xml
b/shenyu-examples/shenyu-examples-websocket/pom.xml
index a18b8df..99bde05 100644
--- a/shenyu-examples/shenyu-examples-websocket/pom.xml
+++ b/shenyu-examples/shenyu-examples-websocket/pom.xml
@@ -80,7 +80,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.6</version>
+ <version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>shenyu-examples-websocket</id>
diff --git a/shenyu-integrated-test/pom.xml b/shenyu-integrated-test/pom.xml
index 3813ee2..bfcc390 100644
--- a/shenyu-integrated-test/pom.xml
+++ b/shenyu-integrated-test/pom.xml
@@ -54,7 +54,6 @@
<guava.version>30.1.1-jre</guava.version>
<tars-client.version>1.7.2</tars-client.version>
<sofa-rpc-all.version>5.7.6</sofa-rpc-all.version>
-
<dockerfile-maven-plugin.version>1.4.6</dockerfile-maven-plugin.version>
<curator.version>4.0.1</curator.version>
<apache.dubbo.version>2.7.5</apache.dubbo.version>
</properties>
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
index efbd5d0..6b33f9b 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml
@@ -54,7 +54,7 @@ services:
- shenyu
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
index 2ab32ff..e27b5c8 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-grpc/docker-compose.yml
@@ -16,7 +16,7 @@
version: "3.9"
services:
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
index 25de4eb..495d7cb 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
@@ -54,7 +54,7 @@ services:
- shenyu
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
index 815208f..e5727de 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
@@ -22,7 +22,7 @@ services:
networks:
- shenyu
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
index 8f1f4f1..c17534c 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml
@@ -25,7 +25,7 @@ services:
- shenyu
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
index 7b85b5b..86f773d 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
@@ -16,7 +16,7 @@
version: "3.9"
services:
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
index e2ff3f8..312383a 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-websocket/docker-compose.yml
@@ -16,7 +16,7 @@
version: "3.9"
services:
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
index cf329c4..6a4c49e 100644
---
a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/docker-compose.yml
@@ -22,7 +22,7 @@ services:
networks:
- shenyu
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
diff --git
a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
index 3f7e669..4d7f636 100644
---
a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/docker-compose.yml
@@ -24,7 +24,7 @@ services:
ports:
- "2181:2181"
shenyu-admin:
- image: apache/shenyu-admin:2.4.2-SNAPSHOT
+ image: apache/shenyu-admin:latest
container_name: shenyu-admin
restart: always
networks:
