diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-10-26 11:19:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-10-26 11:19:42 +0200 |
| commit | 3c49986ec895595edc632da0f14419199ce47667 (patch) | |
| tree | ba22912ac6dd788df389c00b43252e26ce244686 /Docker | |
| parent | 623769b5aeb19e0d0b1684d61fce429961e29116 (diff) | |
New environment variable COPY_LOG_TO_SYSLOG (#2591)
* New environment variable COPY_LOG_TO_SYSLOG
False by default.
Makes it easy to monitor all logs from Syslog or STDERR (e.g. docker
logs).
* Suggestion of native constants
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 3 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 1 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 19923bcf1..6dbebccb0 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -43,10 +43,11 @@ 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 && \ touch /var/www/FreshRSS/Docker/env.txt && \ - echo "17,47 * * * * . /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" | crontab - +ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' ENV FRESHRSS_ENV '' diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 3b1f1a394..4afad0949 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -43,6 +43,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" | crontab - +ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' ENV FRESHRSS_ENV '' diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index f7389fcbc..30b1e205b 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -59,6 +59,7 @@ RUN update-ca-certificates -f # Useful with the `--squash` build option RUN rm /usr/bin/qemu-* /var/www/FreshRSS/Docker/qemu-* +ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' ENV FRESHRSS_ENV '' diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index dcbd7e231..02338c35e 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -12,6 +12,7 @@ find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?upload_max_filesize#s#^.*#u if [ -n "$CRON_MIN" ]; then ( echo "export TZ=$TZ" + echo "export COPY_LOG_TO_SYSLOG=$COPY_LOG_TO_SYSLOG" echo "export COPY_SYSLOG_TO_STDERR=$COPY_SYSLOG_TO_STDERR" ) >/var/www/FreshRSS/Docker/env.txt crontab -l | sed -r "\\#FreshRSS#s#^[^ ]+ #$CRON_MIN #" | crontab - |