From 3a5458cdf64d4b5ceec8728506deb08a4affec3b Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Thu, 8 Dec 2022 14:13:03 +0100 Subject: [PATCH] also update base image --- CHANGELOG.md | 2 +- Dockerfile | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c72edea..e74ec1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -245,6 +245,6 @@ [1.15.2] * Update FreshRSS to 1.20.2 +* Update Cloudron base image to 4.0.0 * [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.2) * Fix security vulnerability in ext.php #4928 reported by @c3l3si4n - diff --git a/Dockerfile b/Dockerfile index c2e1147..8e4b82e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea +FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03fb02dd4e9d0286df RUN mkdir -p /app/code WORKDIR /app/code @@ -26,15 +26,15 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php -RUN crudini --set /etc/php/7.4/apache2/php.ini PHP upload_max_filesize 64M && \ - crudini --set /etc/php/7.4/apache2/php.ini PHP post_max_size 64M && \ - crudini --set /etc/php/7.4/apache2/php.ini PHP memory_limit 64M && \ - crudini --set /etc/php/7.4/apache2/php.ini Session session.save_path /run/php/session && \ - crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_probability 1 && \ - crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100 +RUN crudini --set /etc/php/8.1/apache2/php.ini PHP upload_max_filesize 64M && \ + crudini --set /etc/php/8.1/apache2/php.ini PHP post_max_size 64M && \ + crudini --set /etc/php/8.1/apache2/php.ini PHP memory_limit 64M && \ + crudini --set /etc/php/8.1/apache2/php.ini Session session.save_path /run/php/session && \ + crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_probability 1 && \ + crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_divisor 100 -RUN ln -s /app/data/php.ini /etc/php/7.4/apache2/conf.d/99-cloudron.ini && \ - ln -s /app/data/php.ini /etc/php/7.4/cli/conf.d/99-cloudron.ini +RUN ln -s /app/data/php.ini /etc/php/8.1/apache2/conf.d/99-cloudron.ini && \ + ln -s /app/data/php.ini /etc/php/8.1/cli/conf.d/99-cloudron.ini ADD start.sh /app/code/start.sh