From 4066f3507c2ecca1d1f2d9a40b87688b0fed15d0 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 22 Jun 2017 17:12:13 +0200
Subject: [PATCH] New Rspamd image, also fixes #386

---
 data/Dockerfiles/rspamd/Dockerfile           | 5 +++--
 data/Dockerfiles/rspamd/docker-entrypoint.sh | 5 +++++
 docker-compose.yml                           | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100755 data/Dockerfiles/rspamd/docker-entrypoint.sh

diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 477e12a0..cb2f2592 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/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
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
 CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
-
-USER _rspamd
diff --git a/data/Dockerfiles/rspamd/docker-entrypoint.sh b/data/Dockerfiles/rspamd/docker-entrypoint.sh
new file mode 100755
index 00000000..c6903311
--- /dev/null
+++ b/data/Dockerfiles/rspamd/docker-entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+chown -R _rspamd:_rspamd /var/lib/rspamd
+
+exec "$@"
diff --git a/docker-compose.yml b/docker-compose.yml
index 905e144a..900c1dda 100644
--- a/docker-compose.yml
+++ b/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 "