You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2021/08/03 12:11:43 UTC

[skywalking-docker] branch fix_ui_entry_point created (now 7f6e17a)

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

tanjian pushed a change to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git.


      at 7f6e17a  update ui docker enntry point script.

This branch includes the following new commits:

     new 7f6e17a  update ui docker enntry point script.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[skywalking-docker] 01/01: update ui docker enntry point script.

Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_ui_entry_point
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git

commit 7f6e17aac9105165c71eabe2d03ccc1a4113762f
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Tue Aug 3 20:11:27 2021 +0800

    update ui docker enntry point script.
---
 ui/docker-entrypoint.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/docker-entrypoint.sh b/ui/docker-entrypoint.sh
index 7d499a4..80b85b7 100644
--- a/ui/docker-entrypoint.sh
+++ b/ui/docker-entrypoint.sh
@@ -20,7 +20,12 @@ set -e
 
 export LOGGING_CONFIG="webapp/logback.xml"
 
-[[ ! -z "$SW_OAP_ADDRESS" ]] && export COLLECTOR_RIBBON_LISTOFSERVERS=${SW_OAP_ADDRESS} && echo "COLLECTOR_RIBBON_LISTOFSERVERS=$COLLECTOR_RIBBON_LISTOFSERVERS"
-[[ ! -z "$SW_TIMEOUT" ]] && export COLLECTOR_RIBBON_READTIMEOUT=${SW_TIMEOUT} && echo "COLLECTOR_RIBBON_READTIMEOUT=$COLLECTOR_RIBBON_READTIMEOUT"
+if [[ ! -z "$SW_OAP_ADDRESS" ]]; then
+  address_arr=(${SW_OAP_ADDRESS//,/ })
+  for i in "${!address_arr[@]}"
+  do
+      JAVA_OPTS="${JAVA_OPTS} -Dspring.cloud.discovery.client.simple.instances.oap-service[$i].uri=${address_arr[$i]}"
+  done
+fi
 
-exec java -jar webapp/skywalking-webapp.jar "$@"
+exec java  ${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar "$@"