From 4599d171df48b16eb6f985291c47c97c1ae5dd01 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 2 Apr 2019 21:47:57 +0200 Subject: Docker fix cron logs (#2329) Fix environment variable bug --- Docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Docker/Dockerfile') diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 798561c93..661543724 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -11,7 +11,7 @@ RUN apt update && \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/ -RUN mkdir -p /var/www/FreshRSS /run/apache2/ /run/php/ +RUN mkdir -p /var/www/FreshRSS /run/apache2/ WORKDIR /var/www/FreshRSS COPY . /var/www/FreshRSS @@ -25,8 +25,10 @@ RUN a2dismod -f alias autoindex negotiation status && \ RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.conf && \ sed -r -i "/^\s*Listen /s/^/#/" /etc/apache2/ports.conf && \ - echo "17,47 * * * * su www-data -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" | \ - crontab - + touch /var/www/FreshRSS/Docker/env.txt && \ + echo "17,47 * * * * . /var/www/FreshRSS/Docker/env.txt; \ + su www-data -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" | crontab - ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' -- cgit v1.2.3