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 | |
| parent | d413f67dd28738f4a6d8cf036e00714737f757b8 (diff) | |
| parent | 0eb535e3ac9269d39d2ea7856c4c5532c3296a55 (diff) | |
Merge pull request #2338 from FreshRSS/dev1.14.1
FreshRSS 1.14.1
Diffstat (limited to 'Docker/Dockerfile')
| -rw-r--r-- | Docker/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 56623b001..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,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 "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 '' |