[skywalking] branch master updated: fix docker elasticsearch and oap host (#2574)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e71085  fix docker elasticsearch and oap host (#2574)
4e71085 is described below

commit 4e710857a08f90792b75ec5fc5d4d1696f2bbcc1
Author: neatlife <de...@live.com>
AuthorDate: Tue May 7 08:43:15 2019 +0800

    fix docker elasticsearch and oap host (#2574)
---
 docker/config/application.yml  | 2 +-
 docker/docker-compose.yml      | 2 +-
 docker/ui/docker-entrypoint.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/config/application.yml b/docker/config/application.yml
index d1c9090..7865829 100644
--- a/docker/config/application.yml
+++ b/docker/config/application.yml
@@ -57,7 +57,7 @@ core:
 storage:
   elasticsearch:
     nameSpace: ${SW_NAMESPACE:""}
-    clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
+    clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:elasticsearch:9200}
     user: ${SW_ES_USER:""}
     password: ${SW_ES_PASSWORD:""}
     indexShardsNumber: ${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2}
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4c6da78..88b40f7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -49,4 +49,4 @@ services:
     ports:
       - 8080:8080
     environment:
-      collector.ribbon.listOfServers: oap:12800
\ No newline at end of file
+      collectorListOfServers: oap:12800
diff --git a/docker/ui/docker-entrypoint.sh b/docker/ui/docker-entrypoint.sh
index 37fc457..881368f 100755
--- a/docker/ui/docker-entrypoint.sh
+++ b/docker/ui/docker-entrypoint.sh
@@ -18,4 +18,4 @@
 
 set -ex
 
-exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"
+exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml --collector.ribbon.listOfServers=${collectorListOfServers} "$@"