Merge pull request #1457 from bestlong/fix-elasticsearch

fix #1418 elasticsearch up fails.
2018-03-29 16:18:07 +08:00 · 2018-03-29 16:18:07 +08:00 · 1e5d787a7e
commit 1e5d787a7e
parent 871a9d032a 83140d9939
2 changed files with 1 additions and 4 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -508,7 +508,6 @@ services:
      build: ./elasticsearch
      volumes:
        - elasticsearch-data:/usr/share/elasticsearch/data
-        - elasticsearch-plugins:/usr/share/elasticsearch/plugins
      environment:
        - cluster.name=laradock-cluster
        - bootstrap.memory_lock=true
@ -748,5 +747,3 @@ volumes:
    driver: "local"
  elasticsearch-data:
    driver: "local"
-  elasticsearch-plugins:
-    driver: "local"
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.3

 EXPOSE 9200 9300