fix cron command replacement

This commit is contained in:
Robert Schumann 2018-04-04 18:13:39 +02:00
parent 647bcf4b42
commit 64b23ad6aa
2 changed files with 5 additions and 1 deletions

View File

@ -8,6 +8,7 @@ ENV REPORT_PARSER_SOURCE="https://github.com/techsneeze/dmarcts-report-parser/ar
COPY ./manifest/ /
RUN set -x \
&& apk update \
&& apk add expat-dev mariadb-dev \
&& wget -q --no-check-certificate -O parser.zip $REPORT_PARSER_SOURCE \
&& wget -q --no-check-certificate -O viewer.zip $REPORT_VIEWER_SOURCE \
@ -33,6 +34,8 @@ RUN set -x \
PerlIO::gzip \
IO::Socket::SSL \
; do cpan install $i; done \
&& apk del mariadb-dev expat-dev \
&& apk add mariadb-client-libs \
&& sed -i 's%.*root /var/www/html;% root /var/www/viewer;%g' /etc/nginx/conf.d/default.conf \
&& sed -i 's/.*index index.php index.html index.htm;/ index dmarcts-report-viewer.php;/g' /etc/nginx/conf.d/default.conf \
&& chmod 755 /entrypoint.sh

View File

@ -40,7 +40,8 @@ if [[ -v TEMPLATE_PERL_CONF ]] ; then
fi
if [[ -v PARSER_PROCESS_INTERVAL ]] ; then
echo "${PARSER_PROCESS_INTERVAL} /usr/bin/dmarcts-report-parser.pl -i -d -r" > /etc/cron.d/root
cmd=$(awk '{$1=""; print $0}' /etc/cron.d/root)
echo -n "${PARSER_PROCESS_INTERVAL} ${cmd}" > /etc/cron.d/root
fi
# Start supervisord and services