diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-04-07 14:27:46 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-07 14:27:46 +0200 |
| commit | d008b6c1a7488b99e77287ba14f1fff3ec1a116b (patch) | |
| tree | a0c68e175e36af10e9602e555bf794a90d66be7c /Docker/Dockerfile-Alpine | |
| parent | d413f67dd28738f4a6d8cf036e00714737f757b8 (diff) | |
| parent | 0eb535e3ac9269d39d2ea7856c4c5532c3296a55 (diff) | |
Merge pull request #2338 from FreshRSS/dev1.14.1
FreshRSS 1.14.1
Diffstat (limited to 'Docker/Dockerfile-Alpine')
| -rw-r--r-- | Docker/Dockerfile-Alpine | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index cd0f521a0..589d266e5 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -16,14 +16,16 @@ COPY ./Docker/*.Apache.conf /etc/apache2/conf.d/ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ - sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ + sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ - echo "17,37 * * * * su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" >> \ - /var/spool/cron/crontabs/root + 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 '' |