Revert base of Rspamd

data/Dockerfiles/rspamd/Dockerfile

@@ -1,11 +1,15 @@
-FROM alpine:edge
+FROM debian:jessie-slim
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
+ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C
 
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \
-	&& apk add --no-cache rspamd rspamd-controller rsyslog ca-certificates \
+	&& echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \
-	&& adduser -S _rspamd
+	&& apt-get update && apt-get install -y \
+		ca-certificates \
+		rspamd \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
 
@@ -13,11 +17,8 @@ COPY settings.conf /etc/rspamd/modules.d/settings.conf
 COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf
 COPY dkim_signing.lua /usr/share/rspamd/lua/dkim_signing.lua
 
-CMD /usr/sbin/rspamd -f -u _rspamd -g _rspamd
+CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
 
 RUN rm -rf /tmp/* /var/tmp/*
-RUN mkdir /run/rspamd && chown -R _rspamd: /run/rspamd
 
 USER _rspamd
-
-EXPOSE 11333 11334

docker-compose.yml

@@ -71,9 +71,9 @@ services:
       image: mailcow/rspamd
       build: ./data/Dockerfiles/rspamd
       command: > 
-        /bin/sh -c "
+        /bin/bash -c "
         sleep 5;
-        /usr/sbin/rspamd -f -u _rspamd -g _rspamd
+        /usr/bin/rspamd -f -u _rspamd -g _rspamd
         "
       depends_on:
         nginx-mailcow: