Merge remote-tracking branch 'origin/master'

ca5434e4 · yinyong · ad1b7dca · 7878bf23 · ca5434e4 · ca5434e4
Commit ca5434e4 authored Mar 06, 2020 by yinyong
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Dockerfile ...walking/6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/Dockerfile +1 -1

elasticsearch.yml .../6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/elasticsearch.yml +5 -0

No files found.
--- a/docker-skywalking/6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/Dockerfile
+++ b/docker-skywalking/6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/Dockerfile
-FROM elasticsearch:7.0.1
+FROM elasticsearch:7.0.0
 LABEL maintainer="jian.tan@daocloud.io"

--- a/docker-skywalking/6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/elasticsearch.yml
+++ b/docker-skywalking/6/6.6/elasticsearch-Zone-Asia-SH/7.0.1/elasticsearch.yml
@@ -5,3 +5,8 @@ network.host: 0.0.0.0
 # set to 1 to allow single node clusters
 # Details: https://github.com/elastic/elasticsearch/pull/17288
 discovery.zen.minimum_master_nodes: 1
+thread_pool:
+    warmer:
+        core: 1
+        max: 12
+        keep_alive: 2m