Merge pull request #387 from mailcow/dev

New Rspamd image, also fixes #386

data/Dockerfiles/rspamd/Dockerfile

@@ -18,7 +18,8 @@ RUN apt-get update && apt-get install -y \
 	&& chown _rspamd:_rspamd /run/rspamd
 
 COPY settings.conf /etc/rspamd/modules.d/settings.conf
+COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
-USER _rspamd
+CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd

data/Dockerfiles/rspamd/docker-entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+chown -R _rspamd:_rspamd /var/lib/rspamd
+
+exec "$@"

docker-compose.yml

@@ -77,7 +77,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.0
+      image: mailcow/rspamd:1.1
       build: ./data/Dockerfiles/rspamd
       command: > 
         /bin/bash -c "