From f38d726ed22472d5eb33fc352441f94efaf07f1b Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 17 May 2017 07:46:27 +0200 Subject: [PATCH] Revert base of Rspamd --- data/Dockerfiles/rspamd/Dockerfile | 17 +++++++++-------- docker-compose.yml | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 0eb0b6b6..4a2ea589 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -1,11 +1,15 @@ -FROM alpine:edge +FROM debian:jessie-slim LABEL maintainer "Andre Peters " +ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C -RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \ - && apk add --no-cache rspamd rspamd-controller rsyslog ca-certificates \ - && adduser -S _rspamd +RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ + && echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \ + && 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 diff --git a/docker-compose.yml b/docker-compose.yml index 55ce91e1..d5c4ead0 100644 --- a/docker-compose.yml +++ b/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: