diff --git a/Dockerfile b/Dockerfile index d2c1757..97907db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7 RUN mkdir -p /app/code WORKDIR /app/code -ARG VERSION=1.16.2 +ARG VERSION=1.17.0 RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 RUN mv data data-orig && ln -s /app/data data @@ -33,6 +33,9 @@ RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \ crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \ crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100 +RUN ln -s /app/data/php.ini /etc/php/7.3/apache2/conf.d/99-cloudron.ini && \ + ln -s /app/data/php.ini /etc/php/7.3/cli/conf.d/99-cloudron.ini + ADD start.sh /app/code/start.sh CMD [ "/app/code/start.sh" ] diff --git a/start.sh b/start.sh index dbd2766..3a3c24c 100755 --- a/start.sh +++ b/start.sh @@ -18,6 +18,10 @@ if ! [ -f /app/data/.installed ]; then echo "==> Done." fi +if [[ ! -f /app/data/php.ini ]]; then + echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini +fi + echo "==> Symlinking log file" rm -f /app/data/users/_/log_api.txt touch /tmp/log_api.txt