Skip to content

D
dc-common
Commit a078f3d5 by yinyong
Options

update Dockerfile

parent 7e472c5c
Showing with 10 additions and 10 deletions
docker-skywalking/6/6.6/oap-es7/docker-entrypoint.sh
...@@ -100,11 +100,11 @@ storage: ...@@ -100,11 +100,11 @@ storage:
EOT EOT
fi fi
cat <<EOT >> ${var_application_file} cat <<EOT >> ${var_application_file}
nameSpace: \${SW_NAMESPACE:""} nameSpace: \${SW_NAMESPACE:"skywalking"}
clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200} clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:0.0.0.0:9200}
protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"} protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
user: \${SW_ES_USER:""} user: \${SW_ES_USER:"admin"}
password: \${SW_ES_PASSWORD:""} password: \${SW_ES_PASSWORD:"admin"}
indexShardsNumber: \${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2} indexShardsNumber: \${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2}
indexReplicasNumber: \${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:0} indexReplicasNumber: \${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:0}
# Those data TTL settings will override the same settings in core module. # Those data TTL settings will override the same settings in core module.
...@@ -408,7 +408,7 @@ EOT ...@@ -408,7 +408,7 @@ EOT
echo "[Entrypoint] Apache SkyWalking Docker Image" echo "[Entrypoint] Apache SkyWalking Docker Image"
SW_CLUSTER=${SW_CLUSTER:-standalone} SW_CLUSTER=${SW_CLUSTER:-standalone}
SW_STORAGE=${SW_STORAGE:-h2} SW_STORAGE=${SW_STORAGE:-elasticsearch}
SW_CONFIGURATION=${SW_CONFIGURATION:-none} SW_CONFIGURATION=${SW_CONFIGURATION:-none}
SW_TELEMETRY=${SW_TELEMETRY:-none} SW_TELEMETRY=${SW_TELEMETRY:-none}
......
docker-skywalking/6/6.6/oap/docker-entrypoint.sh
...@@ -100,11 +100,11 @@ storage: ...@@ -100,11 +100,11 @@ storage:
EOT EOT
fi fi
cat <<EOT >> ${var_application_file} cat <<EOT >> ${var_application_file}
nameSpace: \${SW_NAMESPACE:""} nameSpace: \${SW_NAMESPACE:"skywalking"}
clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200} clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:172.31.6.101:9200}
protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"} protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
user: \${SW_ES_USER:""} user: \${SW_ES_USER:"admin"}
password: \${SW_ES_PASSWORD:""} password: \${SW_ES_PASSWORD:"admin"}
indexShardsNumber: \${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2} indexShardsNumber: \${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2}
indexReplicasNumber: \${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:0} indexReplicasNumber: \${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:0}
# Those data TTL settings will override the same settings in core module. # Those data TTL settings will override the same settings in core module.
...@@ -408,7 +408,7 @@ EOT ...@@ -408,7 +408,7 @@ EOT
echo "[Entrypoint] Apache SkyWalking Docker Image" echo "[Entrypoint] Apache SkyWalking Docker Image"
SW_CLUSTER=${SW_CLUSTER:-standalone} SW_CLUSTER=${SW_CLUSTER:-standalone}
SW_STORAGE=${SW_STORAGE:-h2} SW_STORAGE=${SW_STORAGE:-elasticsearch}
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