Rspamd: Wait for maps and settings

master
andryyy 2017-03-03 22:26:50 +01:00
parent ef7a77ef47
commit b656fedca6
2 changed files with 15 additions and 3 deletions

View File

@ -12,18 +12,20 @@ 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 coreutils curl
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
ADD settings.conf /etc/rspamd/modules.d/settings.conf 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
ADD docker-entrypoint.sh /usr/local/bin
RUN pip install -U oletools RUN pip install -U oletools
RUN timeout 30 /usr/bin/rspamd -f -u _rspamd -g _rspamd; exit 0 RUN timeout 30 /usr/bin/rspamd -f -u _rspamd -g _rspamd; exit 0
CMD ["/usr/bin/rspamd","-f", "-u", "_rspamd", "-g", "_rspamd"] ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@ -0,0 +1,10 @@
#!/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