Browse Source

[Solr] Keep EdgeNGramFilterFactory out of query
[Compose] Update PHP-FPM, Solr and ACME images

andryyy 6 years ago
parent
commit
837ee3b3b0
2 changed files with 4 additions and 6 deletions
  1. 0 1
      data/Dockerfiles/solr/solr-schema-7.7.0.xml
  2. 4 5
      docker-compose.yml

+ 0 - 1
data/Dockerfiles/solr/solr-schema-7.7.0.xml

@@ -18,7 +18,6 @@
     </analyzer>
     <analyzer type="query">
       <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="20"/>
       <filter class="solr.SynonymGraphFilterFactory" expand="true" ignoreCase="true" synonyms="synonyms.txt"/>
       <filter class="solr.FlattenGraphFilterFactory"/>
       <filter class="solr.StopFilterFactory" words="stopwords.txt" ignoreCase="true"/>

+ 4 - 5
docker-compose.yml

@@ -94,7 +94,7 @@ services:
             - rspamd
 
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.34
+      image: mailcow/phpfpm:1.35
       build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
@@ -296,7 +296,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.48
+      image: mailcow/acme:1.49
       build: ./data/Dockerfiles/acme
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -395,12 +395,11 @@ services:
             - dockerapi
 
     solr-mailcow:
-      image: mailcow/solr:1.3
+      image: mailcow/solr:1.4
       build: ./data/Dockerfiles/solr
       restart: always
       volumes:
-        - solr-vol-1:/opt/solr/server/solr/dovecot/data
-        - ./data/conf/solr:/etc/solr
+        - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment: