public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

New Rspamd image, also fixes #386

4066f350

andryyy <[email protected]> 9 years ago

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

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
 
-CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
-USER _rspamd
+CMD /usr/bin/rspamd -f -u _rspamd -g _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 "