You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by il...@apache.org on 2019/07/05 09:00:27 UTC
[dubbo-samples] branch master updated: clean up dubbo-samples-chain
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 9a76e2c clean up dubbo-samples-chain
9a76e2c is described below
commit 9a76e2cc3c27f8c9dbb833b74b9c47f8dc58cc00
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jul 5 16:59:07 2019 +0800
clean up dubbo-samples-chain
---
.../dubbo-samples-chain-backend/pom.xml | 8 +--
.../dubbo-samples-chain-front/pom.xml | 66 +++++++++++++---------
.../dubbo-samples-chain-middle/pom.xml | 8 +--
3 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml b/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml
index d65b654..d8a95b1 100644
--- a/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml
+++ b/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml
@@ -34,6 +34,7 @@
<properties>
<main-class>org.apache.dubbo.samples.chain.BackendProvider</main-class>
<image.name>${artifactId}:${dubbo.version}</image.name>
+ <java-image.name>openjdk:8</java-image.name>
<dubbo.port>20880</dubbo.port>
</properties>
@@ -80,13 +81,12 @@
</to>
<container>
<mainClass>${main-class}</mainClass>
- <ports>
- <port>${dubbo.port}</port>
- </ports>
<environment>
<DUBBO_IP_TO_REGISTRY>${dubbo-local-address}</DUBBO_IP_TO_REGISTRY>
- <zookeeper.address>${dubbo-local-address}</zookeeper.address>
</environment>
+ <jvmFlags>
+ <jvmFlag>-Dzookeeper.address=${dubbo-local-address}</jvmFlag>
+ </jvmFlags>
</container>
</configuration>
<executions>
diff --git a/dubbo-samples-chain/dubbo-samples-chain-front/pom.xml b/dubbo-samples-chain/dubbo-samples-chain-front/pom.xml
index 687e1bf..55140a9 100644
--- a/dubbo-samples-chain/dubbo-samples-chain-front/pom.xml
+++ b/dubbo-samples-chain/dubbo-samples-chain-front/pom.xml
@@ -31,6 +31,10 @@
<artifactId>dubbo-samples-chain-front</artifactId>
+ <properties>
+ <zookeeper.port>2181</zookeeper.port>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -87,11 +91,42 @@
<configuration>
<images>
<image>
- <external>
- <type>compose</type>
- <basedir>src/main/resources/docker</basedir>
- <composeFile>docker-compose.yml</composeFile>
- </external>
+ <name>zookeeper:latest</name>
+ <run>
+ <ports>
+ <port>${zookeeper.port}:${zookeeper.port}</port>
+ </ports>
+ <wait>
+ <tcp>
+ <host>${dubbo-local-address}</host>
+ <ports>
+ <port>${zookeeper.port}</port>
+ </ports>
+ </tcp>
+ </wait>
+ </run>
+ </image>
+ <image>
+ <name>dubbo-samples-chain-backend:${dubbo.version}</name>
+ <run>
+ <ports>
+ <port>20880:20880</port>
+ </ports>
+ <wait>
+ <log>dubbo service started</log>
+ </wait>
+ </run>
+ </image>
+ <image>
+ <name>dubbo-samples-chain-middle:${dubbo.version}</name>
+ <run>
+ <ports>
+ <port>20881:20881</port>
+ </ports>
+ <wait>
+ <log>dubbo service started</log>
+ </wait>
+ </run>
</image>
</images>
</configuration>
@@ -113,27 +148,6 @@
</executions>
</plugin>
- <!-- wait until docker instances fully start up -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <tasks>
- <sleep seconds="5" />
- </tasks>
- </configuration>
- <executions>
- <execution>
- <id>sleep-for-a-while</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/dubbo-samples-chain/dubbo-samples-chain-middle/pom.xml b/dubbo-samples-chain/dubbo-samples-chain-middle/pom.xml
index 5a80a12..6018bf2 100644
--- a/dubbo-samples-chain/dubbo-samples-chain-middle/pom.xml
+++ b/dubbo-samples-chain/dubbo-samples-chain-middle/pom.xml
@@ -33,6 +33,7 @@
<properties>
<main-class>org.apache.dubbo.samples.chain.MiddleEndProvider</main-class>
<image.name>${artifactId}:${dubbo.version}</image.name>
+ <java-image.name>openjdk:8</java-image.name>
<dubbo.port>20881</dubbo.port>
</properties>
@@ -79,13 +80,12 @@
</to>
<container>
<mainClass>${main-class}</mainClass>
- <ports>
- <port>${dubbo.port}</port>
- </ports>
<environment>
<DUBBO_IP_TO_REGISTRY>${dubbo-local-address}</DUBBO_IP_TO_REGISTRY>
- <zookeeper.address>${dubbo-local-address}</zookeeper.address>
</environment>
+ <jvmFlags>
+ <jvmFlag>-Dzookeeper.address=${dubbo-local-address}</jvmFlag>
+ </jvmFlags>
</container>
</configuration>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org