This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 5af49a4a9aceb487c2e8acf83d838c6f4e38dfef
Author: liubao <bi...@qq.com>
AuthorDate: Tue May 26 19:49:10 2020 +0800
[SCB-1935]publish service center port to local access
---
demo/docker-run-config-edge/pom.xml | 4 ++--
demo/docker-run-config-local/pom.xml | 31 -------------------------------
demo/docker-run-config/pom.xml | 4 ++--
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/demo/docker-run-config-edge/pom.xml
b/demo/docker-run-config-edge/pom.xml
index dbc8e61..ac7341f 100644
--- a/demo/docker-run-config-edge/pom.xml
+++ b/demo/docker-run-config-edge/pom.xml
@@ -52,7 +52,7 @@
<time>60000</time>
</wait>
<ports>
- <port>service.center.port:30100</port>
+ <port>30100:30100</port>
</ports>
</run>
</image>
@@ -284,7 +284,7 @@
<version>2.19.1</version>
<configuration>
<systemPropertyVariables>
-
<servicecomb.service.registry.address>http://${docker.hostname}:${service.center.port}</servicecomb.service.registry.address>
+
<servicecomb.service.registry.address>http://${docker.hostname}:30100</servicecomb.service.registry.address>
</systemPropertyVariables>
<argLine>${jacoco.failsafe.argLine}</argLine>
</configuration>
diff --git a/demo/docker-run-config-local/pom.xml
b/demo/docker-run-config-local/pom.xml
index 619c5c0..e2a99dd 100644
--- a/demo/docker-run-config-local/pom.xml
+++ b/demo/docker-run-config-local/pom.xml
@@ -39,24 +39,6 @@
<configuration>
<images>
<image>
- <name>servicecomb/service-center</name>
- <alias>service-center</alias>
- <run>
- <wait>
- <log>server is ready</log>
- <tcp>
- <ports>
- <port>30100</port>
- </ports>
- </tcp>
- <time>60000</time>
- </wait>
- <ports>
- <port>service.center.port:30100</port>
- </ports>
- </run>
- </image>
- <image>
<name>${demo.service.name}:${project.version}</name>
<alias>${demo.service.name}</alias>
<run>
@@ -66,17 +48,8 @@
</JAVA_OPTS>
<JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH>
</env>
- <links>
- <link>service-center:sc.servicecomb.io</link>
- </links>
<wait>
<log>Register microservice instance success</log>
- <!--
- the log waiting of the plugin has a bug and fails
frequently
- refer to
https://github.com/fabric8io/docker-maven-plugin/issues/767
- this http checking is used as a temporary solution
- -->
-
<tcp>
<ports>
<port>8080</port>
@@ -85,12 +58,8 @@
<time>120000</time>
</wait>
<ports>
- <port>7070:7070</port>
<port>8080:8080</port>
</ports>
- <dependsOn>
- <container>service-center</container>
- </dependsOn>
</run>
</image>
</images>
diff --git a/demo/docker-run-config/pom.xml b/demo/docker-run-config/pom.xml
index ea4445f..b8afd41 100644
--- a/demo/docker-run-config/pom.xml
+++ b/demo/docker-run-config/pom.xml
@@ -52,7 +52,7 @@
<time>60000</time>
</wait>
<ports>
- <port>service.center.port:30100</port>
+ <port>30100:30100</port>
</ports>
</run>
</image>
@@ -146,7 +146,7 @@
<version>2.19.1</version>
<configuration>
<systemPropertyVariables>
-
<servicecomb.service.registry.address>http://${docker.hostname}:${service.center.port}</servicecomb.service.registry.address>
+
<servicecomb.service.registry.address>http://${docker.hostname}:30100</servicecomb.service.registry.address>
</systemPropertyVariables>
<argLine>${jacoco.failsafe.argLine}</argLine>
</configuration>
