diff options
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Newest | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 2 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index c86298b20..a08740449 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -45,7 +45,7 @@ RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.co touch /var/www/FreshRSS/Docker/env.txt && \ echo "7,37 * * * * . /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" > /var/www/FreshRSS/Docker/crontab.default + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /etc/crontab.freshrss.default ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 3cbe3edf4..8a14f32db 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -42,7 +42,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ touch /var/www/FreshRSS/Docker/env.txt && \ echo "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ - 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /var/www/FreshRSS/Docker/crontab.default + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /etc/crontab.freshrss.default ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index 892c69a6f..80ba98566 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -42,7 +42,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ touch /var/www/FreshRSS/Docker/env.txt && \ echo "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ - 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /var/www/FreshRSS/Docker/crontab.default + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /etc/crontab.freshrss.default ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest index 9762653be..e0d9b5e23 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -42,7 +42,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ touch /var/www/FreshRSS/Docker/env.txt && \ echo "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ - 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /var/www/FreshRSS/Docker/crontab.default + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /etc/crontab.freshrss.default ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 53cc73723..1f36d6972 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -51,7 +51,7 @@ RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.co 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" > /var/www/FreshRSS/Docker/crontab.default + 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" > /etc/crontab.freshrss.default # Seems needed for arm32v7/ubuntu on Docker Hub RUN update-ca-certificates -f diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index d6cc34506..e48a5e58f 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -20,7 +20,7 @@ if [ -n "$CRON_MIN" ]; then echo "export COPY_SYSLOG_TO_STDERR=$COPY_SYSLOG_TO_STDERR" echo "export FRESHRSS_ENV=$FRESHRSS_ENV" ) >/var/www/FreshRSS/Docker/env.txt - sed </var/www/FreshRSS/Docker/crontab.default \ + sed </etc/crontab.freshrss.default \ -r "s#^[^ ]+ #$CRON_MIN #" | crontab - fi |