From a8a403dd675f6c04af941b3577860ab187794157 Mon Sep 17 00:00:00 2001 From: Adrien le Maire Date: Thu, 22 Oct 2020 09:44:33 +0000 Subject: [PATCH] Should fix podman issues --- freshrss/Dockerfile | 6 ++++-- freshrss/entrypoint.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/freshrss/Dockerfile b/freshrss/Dockerfile index 2a73e64..2e53bba 100644 --- a/freshrss/Dockerfile +++ b/freshrss/Dockerfile @@ -35,11 +35,13 @@ RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.co sed -r -i "/^\s*Listen /s/^/#/" /etc/apache2/ports.conf && \ sed -r -i "/^\s*User /s/^/#/" /etc/apache2/apache2.conf && \ sed -r -i "/^\s*Group /s/^/#/" /etc/apache2/apache2.conf && \ - touch /var/www/FreshRSS/Docker/env.txt + touch /var/www/FreshRSS/Docker/env.txt && \ + mkdir /var/run/apache2/ && \ + chown www-data:ww-data /var/run/apache2/ WORKDIR /var/www/FreshRSS RUN chown -R :www-data . && \ - chmod -R g+r . && chmod -R g+w ./data/ && \ + chmod -R g+r . && chmod -R g+w ./data/ ./Docker/env.txt && \ find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?date.timezone#s#^.*#date.timezone = $TZ#" {} \; && \ find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?post_max_size#s#^.*#post_max_size = 32M#" {} \; && \ find /etc/php*/ -name php.ini -exec sed -r -i "\\#^;?upload_max_filesize#s#^.*#upload_max_filesize = 32M#" {} \; diff --git a/freshrss/entrypoint.sh b/freshrss/entrypoint.sh index 594487d..9df1984 100755 --- a/freshrss/entrypoint.sh +++ b/freshrss/entrypoint.sh @@ -10,7 +10,7 @@ if [ -n "$CRON_MIN" ]; then echo "export FRESHRSS_ENV=$FRESHRSS_ENV" ) >/var/www/FreshRSS/Docker/env.txt echo "${CRON_MIN} * * * * . /var/www/FreshRSS/Docker/env.txt; \ - su www-data -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ + php /var/www/FreshRSS/app/actualize_script.php \ 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" | crontab - fi