diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-04-02 21:47:57 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-02 21:47:57 +0200 |
| commit | 4599d171df48b16eb6f985291c47c97c1ae5dd01 (patch) | |
| tree | 06d18c126b8d6df3d738a8ee1f0d5388e87a84a7 /Docker | |
| parent | d78366c0beb3074df081fa6210312d7dd1c1de16 (diff) | |
Docker fix cron logs (#2329)
Fix environment variable bug
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 8 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 6 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 1 |
3 files changed, 10 insertions, 5 deletions
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 '' diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index fcaec37da..589d266e5 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -22,8 +22,10 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ - echo "27,57 * * * * su apache -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 "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" | crontab - ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index 9db5c8185..b7a961569 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -8,6 +8,7 @@ chmod -R g+r . && chmod -R g+w ./data/ find /etc/php*/ -name php.ini -exec sed -r -i "\#^;?date.timezone#s#^.*#date.timezone = $TZ#" {} \; if [ -n "$CRON_MIN" ]; then + (echo "export TZ=$TZ" ; 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 - fi |