Browse Source

Updated elasticsearch 6 to 6.8. Backported updates from 7.6 into 6.x.

Mark Shust 5 years ago
parent
commit
c4cebfb221

+ 5 - 4
README.md

@@ -107,10 +107,11 @@ View Dockerfiles:
       - [`7.2-fpm-1`](https://github.com/markshust/docker-magento/tree/23.1.1/images/php/7.2)
       - [`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.6
-      - [`latest`, `7.6`, `7.6.2-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.6)
-  - 6.5
-      - [`6.5`, `6.5.4-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/6.5)
+  - 7
+      - [`latest`, `7.6`, `7.6.2-1`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.6)
+  - 6
+      - [`6.8`, `6.8.8-0`](https://github.com/markshust/docker-magento/tree/master/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
 

+ 3 - 1
images/elasticsearch/6.5/Dockerfile → images/elasticsearch/6.8/Dockerfile

@@ -1,4 +1,6 @@
-FROM elasticsearch:6.5.4
+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

+ 0 - 0
images/elasticsearch/7.6/config/elasticsearch.yml → images/elasticsearch/6.8/conf/elasticsearch.yml


+ 5 - 0
images/elasticsearch/7.6/conf/elasticsearch.yml

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