Merge branch 'master' into admin-login

2019-03-10 10:38:42 +01:00
parent 5754c6e2aa a70663d64e
commit ae19d81f2d
10 changed files with 374 additions and 379 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,7 +71,7 @@ services:
            - clamd

    rspamd-mailcow:
-      image: mailcow/rspamd:1.36
+      image: mailcow/rspamd:1.37
      build: ./data/Dockerfiles/rspamd
      stop_grace_period: 30s
      depends_on:
@@ -405,11 +405,12 @@ services:
            - dockerapi

    solr-mailcow:
-      image: mailcow/solr:1.2
+      image: mailcow/solr:1.3
      build: ./data/Dockerfiles/solr
      restart: always
      volumes:
        - solr-vol-1:/opt/solr/server/solr/dovecot/data
+        - ./data/conf/solr:/etc/solr
      dns:
        - ${IPV4_NETWORK:-172.22.1}.254
      environment: