From 261e1ad4fbe5165354e5974b2561d9ede8e220f0 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 12 Jun 2017 23:48:42 +0200 Subject: [PATCH] Rspamd stable --- data/Dockerfiles/rspamd/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 4500c73e..416f415b 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -4,22 +4,20 @@ LABEL maintainer "Andre Peters " ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C -RUN apt-key adv --fetch-keys http://rspamd.com/apt/gpg.key \ - && echo "deb http://rspamd.com/apt/ jessie main" > /etc/apt/sources.list.d/rspamd.list \ +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 + && rm -rf /var/lib/apt/lists/* \ + && echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local \ + && apt-get autoremove --purge \ + && apt-get clean \ + && mkdir -p /run/rspamd \ + && chown _rspamd:_rspamd /run/rspamd COPY settings.conf /etc/rspamd/modules.d/settings.conf -RUN apt-get autoremove --purge \ - && apt-get clean - CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd -RUN rm -rf /tmp/* /var/tmp/* - USER _rspamd