Commit 59209c6d by yinyong

Merge branch 'master' of http://193.112.143.129/bltdc/dc-common

parents d05f0752 227c3931
...@@ -58,7 +58,7 @@ cluster: ...@@ -58,7 +58,7 @@ cluster:
consul: consul:
serviceName: \${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"} serviceName: \${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
# Consul cluster nodes, example: 10.0.0.1:8500,10.0.0.2:8500,10.0.0.3:8500 # Consul cluster nodes, example: 10.0.0.1:8500,10.0.0.2:8500,10.0.0.3:8500
hostPort: \${SW_CLUSTER_CONSUL_HOST_PORT:consul:8500} hostPort: \${SW_CLUSTER_CONSUL_HOST_PORT:172.31.4.81:8500,172.31.2.78:8500,172.31.4.83:8500}
EOT EOT
} }
...@@ -407,8 +407,8 @@ EOT ...@@ -407,8 +407,8 @@ EOT
echo "[Entrypoint] Apache SkyWalking Docker Image" echo "[Entrypoint] Apache SkyWalking Docker Image"
SW_CLUSTER=${SW_CLUSTER:-standalone} SW_CLUSTER=${SW_CLUSTER:-consul}
SW_STORAGE=${SW_STORAGE:-elasticsearch} SW_STORAGE=${SW_STORAGE:-h2}
SW_CONFIGURATION=${SW_CONFIGURATION:-none} SW_CONFIGURATION=${SW_CONFIGURATION:-none}
SW_TELEMETRY=${SW_TELEMETRY:-none} SW_TELEMETRY=${SW_TELEMETRY:-none}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment