Merge branch 'master' into zhangxin/fix/lost-int-tags

2017-06-26 20:19:23 +08:00 · 2017-06-26 20:19:23 +08:00 · 8223377cd4
parent 6081f7f7b1 5ad4df2aa6
commit 8223377cd4
1 changed files with 3 additions and 0 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -30,6 +30,9 @@ services:
  es-server:
    image: elasticsearch:5.3
    command: "-Enode.name=TestNode -Enetwork.host=0.0.0.0 -Ehttp.cors.enabled=true -Ehttp.cors.allow-origin=* -Ethread_pool.bulk.queue_size=1000 -Ecluster.name=CollectorDBCluster"
+    environment:
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
    expose:
      - "9200"
      - "9300"