Merge pull request #1457 from bestlong/fix-elasticsearch

fix #1418 elasticsearch up fails.

Merge pull request #1457 from bestlong/fix-elasticsearch
fix #1418 elasticsearch up fails.
1e5d787a · Yu-Lung Shao (Allen) · GitHub · 871a9d03 · 83140d99 · 1e5d787a
Unverified Commit 1e5d787a authored Mar 29, 2018 by Yu-Lung Shao (Allen) Committed by GitHub Mar 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

docker-compose.yml docker-compose.yml +0 -3

Dockerfile elasticsearch/Dockerfile +1 -1

No files found.
--- 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
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.3

 EXPOSE 9200 9300