Pārlūkot izejas kodu

fix elasticsearch

Torben Höhn 3 gadi atpakaļ
vecāks
revīzija
373d4a1473
2 mainītis faili ar 8 papildinājumiem un 11 dzēšanām
  1. 8 1
      compose/docker-compose.yml
  2. 0 10
      compose/env/elasticsearch.env

+ 8 - 1
compose/docker-compose.yml

@@ -63,7 +63,14 @@ services:
     ports:
       - "9200:9200"
       - "9300:9300"
-    env_file: env/elasticsearch.env
+    environment:
+      - "discovery.type=single-node"
+      ## Set custom heap size to avoid memory errors
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+      ## Avoid test failures due to small disks
+      ## More info at https://github.com/markshust/docker-magento/issues/488
+      - "cluster.routing.allocation.disk.threshold_enabled=false"
+      - "index.blocks.read_only_allow_delete"
     extra_hosts: *appextrahosts
 
   rabbitmq:

+ 0 - 10
compose/env/elasticsearch.env

@@ -1,12 +1,2 @@
 ES_HOST=elasticsearch
 ES_PORT=9200
-
-discovery.type=single-node
-
-# Set custom heap size to avoid memory errors
-ES_JAVA_OPTS=-Xms1g -Xmx1g
-
-# Avoid test failures due to small disks
-# More info at https://github.com/markshust/docker-magento/issues/488
-cluster.routing.allocation.disk.threshold_enabled=false
-index.blocks.read_only_allow_delete