Fixed issue with elasticsearch startup #263

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 N/A
 
+## [32.0.1] - 2020-05-12
+
+### Fixed
+- Backed out last Elasticsearch update with elasticsearch.yml, caused issues with startup.
+
 ## [32.0.0] - 2020-05-11
 
 ### Fixed

README.md

@@ -108,9 +108,12 @@ View Dockerfiles:
       - [`7.2-fpm-0`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.2)
 - [markoshust/magento-elasticsearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-elasticsearch/)
   - 7
-      - [`latest`, `7.6`, `7.6.2-1`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.6)
+      - [`latest`, `7.6`, `7.6.2-2`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.6)
+      - [`7.6.2-1`](https://github.com/markshust/docker-magento/tree/32.0.0/images/elasticsearch/7.6)
+      - [`7.6.2-0`](https://github.com/markshust/docker-magento/tree/31.0.2/images/elasticsearch/7.6)
   - 6
-      - [`6.8`, `6.8.8-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/6.8)
+      - [`6.8`, `6.8.8-1`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/6.8)
+      - [`6.8`, `6.8.8-0`](https://github.com/markshust/docker-magento/tree/32.0.0/images/elasticsearch/6.8)
       - [`6.5`, `6.5.4-0`](https://github.com/markshust/docker-magento/tree/31.0.2/images/elasticsearch/6.5)
 
 ## Usage

compose/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 32.0.0
+# Version 32.0.1
 
 version: "3"
 

compose/docker-compose.yml

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 32.0.0
+# Version 32.0.1
 
 version: "3"
 
@@ -38,7 +38,7 @@ services:
     image: redis:5.0
 
   elasticsearch:
-    image: markoshust/magento-elasticsearch:7.6.2-1
+    image: markoshust/magento-elasticsearch:7.6.2-2
     ports:
       - "9200:9200"
       - "9300:9300"

images/elasticsearch/6.8/Dockerfile

@@ -2,5 +2,3 @@ FROM elasticsearch:6.8.8
 
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-phonetic
-
-COPY ./conf/elasticsearch.yml /usr/share/elasticsearch/config/elasticsearch.yml

images/elasticsearch/6.8/conf/elasticsearch.yml

@@ -1,5 +0,0 @@
-cluster.name: "docker-cluster"
-network.host: 0.0.0.0
-
-index.min_shingle_size: 2
-index.max_shingle_size: 2

images/elasticsearch/7.6/Dockerfile

@@ -2,5 +2,3 @@ FROM elasticsearch:7.6.2
 
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-phonetic
-
-COPY ./conf/elasticsearch.yml /usr/share/elasticsearch/config/elasticsearch.yml

images/elasticsearch/7.6/conf/elasticsearch.yml

@@ -1,5 +0,0 @@
-cluster.name: "docker-cluster"
-network.host: 0.0.0.0
-
-index.min_shingle_size: 2
-index.max_shingle_size: 2