[skywalking] branch master updated: Update docker-entrypoint.sh (#3465)

[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 db67b87  Update docker-entrypoint.sh (#3465)
db67b87 is described below

commit db67b87575707fc7b4dae414eeea3bea22a76987
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 12 10:15:18 2019 +0800

    Update docker-entrypoint.sh (#3465)
---
 docker/oap/docker-entrypoint.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index b2f4c83..070e7a5 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -82,9 +82,23 @@ EOT
 }
 
 generateStorageElastisearch() {
+if [[ "$SW_RECEIVER_ZIPKIN_ENABLED" = "true" ]]; then
+    cat <<EOT >> ${var_application_file}
+storage:
+  zipkin-elasticsearch:
+EOT
+elif [[ "$SW_RECEIVER_JAEGER_ENABLED" = "true" ]]; then
+    cat <<EOT >> ${var_application_file}
+storage:
+  jaeger-elasticsearch:
+EOT
+else
     cat <<EOT >> ${var_application_file}
 storage:
   elasticsearch:
+EOT
+fi
+cat <<EOT >> ${var_application_file}
     nameSpace: \${SW_NAMESPACE:""}
     clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
     protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
@@ -280,6 +294,15 @@ EOT
     cat <<EOT >> ${var_application_file}
 receiver-sharing-server:
   default:
+   restHost: \${SW_RECEIVER_SHARING_REST_HOST:0.0.0.O}
+   restPort: \${SW_RECEIVER_SHARING_REST_PORT:0}
+   restContextPath: \${SW_RECEIVER_SHARING_REST_CONTEXT_PATH:/}
+   gRPCHost: \${SW_RECEIVER_SHARING_GRPC_HOST:0.0.0.O}
+   gRPCPort: \${SW_RECEIVER_SHARING_GRPC_PORT:0}
+   maxConcurrentCallsPerConnection: \${SW_RECEIVER_SHARING_MAX_CONCURRENT_CALL:0}
+   maxMessageSize: \${SW_RECEIVER_SHARING_MAX_MESSAGE_SIZE:0}
+   gRPCThreadPoolSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_SIZE:0}
+   gRPCThreadPoolQueueSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_QUEUE_SIZE:0}
 receiver-register:
   default:
 receiver-trace: