diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-08-09 19:14:48 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-08-09 19:14:48 +0200 |
| commit | 8f0d69efb2ae3dc467c147cd81a570f68ca05576 (patch) | |
| tree | 0601120110931e50cedd1169bb32f01cab943ff7 /Docker | |
| parent | 5c7ea3c7e59131e854077757efd4fbc2c54bc5ea (diff) | |
Docker Alpine PHP 8.4 (#7803)
Force our Alpine-based Docker image to PHP 8.4 (default is still PHP 8.3).
Related to the fact that we may have to [revert our Debian image to Debian 12 with PHP 8.2 instead of Debian 13 with PHP 8.4](https://github.com/FreshRSS/FreshRSS/pull/7805), so for the next FreshRSS release, we can offer at least one image with PHP 8.4.
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile-Alpine | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 26cccd6c9..33eb28c93 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -5,10 +5,10 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] RUN apk add --no-cache \ tzdata \ - apache2 php-apache2 \ - php php-curl php-gmp php-intl php-mbstring php-xml php-zip \ - php-ctype php-dom php-fileinfo php-iconv php-json php-opcache php-openssl php-phar php-session php-simplexml php-xmlreader php-xmlwriter php-xml php-tokenizer php-zlib \ - php-pdo_sqlite php-pdo_mysql php-pdo_pgsql + apache2 php84-apache2 \ + php84 php84-curl php84-gmp php84-intl php84-mbstring php84-xml php84-zip \ + php84-ctype php84-dom php84-fileinfo php84-iconv php84-json php84-opcache php84-openssl php84-phar php84-session php84-simplexml php84-xmlreader php84-xmlwriter php84-xml php84-tokenizer php84-zlib \ + php84-pdo_sqlite php84-pdo_mysql php84-pdo_pgsql RUN mkdir -p /var/www/FreshRSS /run/apache2/ WORKDIR /var/www/FreshRSS @@ -39,6 +39,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ + if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php84 /usr/bin/php; else true; fi && \ # Disable built-in updates when using Docker, as the full image is supposed to be updated instead. sed -r -i "\\#disable_update#s#^.*#\t'disable_update' => true,#" ./config.default.php && \ touch /var/www/FreshRSS/Docker/env.txt && \ |