Skip to content
Permalink
Browse files
clean up dubbo-samples-chain
  • Loading branch information
beiwei30 committed Jul 5, 2019
1 parent 4df17d7 commit 9a76e2cc3c27f8c9dbb833b74b9c47f8dc58cc00
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 34 deletions.
@@ -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>
@@ -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>
@@ -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>

0 comments on commit 9a76e2c

Please sign in to comment.