Fix Rspamd

master
andryyy 2017-03-04 00:06:58 +01:00
parent 714490ad5e
commit c303ef35ae
3 changed files with 1 additions and 1187 deletions

View File

@ -12,7 +12,7 @@ RUN dpkg-divert --local --rename --add /sbin/initctl \
RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \
&& echo "deb http://rspamd.com/apt-stable/ xenial main" > /etc/apt/sources.list.d/rspamd.list \ && echo "deb http://rspamd.com/apt-stable/ xenial main" > /etc/apt/sources.list.d/rspamd.list \
&& apt-get update \ && apt-get update \
&& apt-get -y install rspamd ca-certificates python-pip coreutils && apt-get -y install rspamd ca-certificates python-pip
RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
@ -20,7 +20,6 @@ ADD settings.conf /etc/rspamd/modules.d/settings.conf
ADD antivirus.conf /etc/rspamd/modules.d/antivirus.conf ADD antivirus.conf /etc/rspamd/modules.d/antivirus.conf
RUN pip install -U oletools RUN pip install -U oletools
RUN timeout 30 /usr/bin/rspamd -f -u _rspamd -g _rspamd; exit 0
CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"] CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]

View File

@ -1,10 +0,0 @@
#!/bin/bash
set -e
while true; do
SC=$(curl -s -o /dev/null -w "%{http_code}" http://nginx:8081/settings.php)
if [[ ${SC} == "200" ]]; then
sleep 3
exec "$@"
fi
sleep 3
done

File diff suppressed because it is too large Load Diff