From b1f1c0fae402166aa9de75133e50c1cc9f2ba4f8 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 21 Jul 2026 18:32:25 -0400
Subject: [PATCH] rebase to alpine 3.24

---
 Dockerfile         | 30 +++++++++++++++---------------
 Dockerfile.aarch64 | 30 +++++++++++++++---------------
 README.md          |  1 +
 readme-vars.yml    |  1 +
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4e0548a..e902ade 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24
 
 # set version label
 ARG BUILD_DATE
@@ -12,22 +12,22 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php84-dom \
-    php84-exif \
-    php84-gmp \
-    php84-intl \
-    php84-mysqli \
-    php84-mysqlnd \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pgsql \
-    php84-sqlite3 \
+    php85-dom \
+    php85-exif \
+    php85-gmp \
+    php85-intl \
+    php85-mysqli \
+    php85-mysqlnd \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pgsql \
+    php85-sqlite3 \
     sqlite && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
-  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
   echo "**** install app ****" && \
   if [ -z ${FRESHRSS_RELEASE+x} ]; then \
     FRESHRSS_RELEASE=$(curl -sX GET "https://api.github.com/repos/FreshRSS/FreshRSS/releases/latest" \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0385d9e..b947d41 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24
 
 # set version label
 ARG BUILD_DATE
@@ -12,22 +12,22 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php84-dom \
-    php84-gmp \
-    php84-exif \
-    php84-intl \
-    php84-mysqli \
-    php84-mysqlnd \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pgsql \
-    php84-sqlite3 \
+    php85-dom \
+    php85-gmp \
+    php85-exif \
+    php85-intl \
+    php85-mysqli \
+    php85-mysqlnd \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pgsql \
+    php85-sqlite3 \
     sqlite && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
-  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
   echo "**** install app ****" && \
   if [ -z ${FRESHRSS_RELEASE+x} ]; then \
     FRESHRSS_RELEASE=$(curl -sX GET "https://api.github.com/repos/FreshRSS/FreshRSS/releases/latest" \
diff --git a/README.md b/README.md
index 056a87a..0b2c0c5 100644
--- a/README.md
+++ b/README.md
@@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.07.26:** - Rebase to Alpine 3.24.
 * **27.07.25:** - Rebase to Alpine 3.22.
 * **19.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **10.04.24:** - Added php-exif module to resolve issue with fever api.
diff --git a/readme-vars.yml b/readme-vars.yml
index f21a991..597ca10 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -82,6 +82,7 @@ init_diagram: |
   "freshrss:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "21.07.26:", desc: "Rebase to Alpine 3.24."}
   - {date: "27.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "19.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "10.04.24:", desc: "Added php-exif module to resolve issue with fever api."}