From be8538d5b5e5566735fdaebc2ffb6d8fb1d599b2 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Sun, 5 Jul 2026 18:51:46 +0000
Subject: [PATCH] Rebase to 3.24

---
 Dockerfile         | 20 ++++++++++----------
 Dockerfile.aarch64 | 20 ++++++++++----------
 README.md          |  2 ++
 readme-vars.yml    |  2 ++
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4271b20..7a8a3f8 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,15 +12,15 @@ LABEL maintainer="gilbn"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php84-ftp \
-    php84-gd \
-    php84-intl \
-    php84-ldap \
-    php84-mysqli \
-    php84-pdo_mysql \
-    php84-pdo_sqlite \
-    php84-sqlite3 \
-    php84-tokenizer && \
+    php85-ftp \
+    php85-gd \
+    php85-intl \
+    php85-ldap \
+    php85-mysqli \
+    php85-pdo_mysql \
+    php85-pdo_sqlite \
+    php85-sqlite3 \
+    php85-tokenizer && \
   echo "**** install xbackbone ****" && \
     mkdir -p /app/www/public && \
   if [ -z ${XBACKBONE_RELEASE+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2f50421..2037b76 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,15 +12,15 @@ LABEL maintainer="gilbn"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php84-ftp \
-    php84-gd \
-    php84-intl \
-    php84-ldap \
-    php84-mysqli \
-    php84-pdo_mysql \
-    php84-pdo_sqlite \
-    php84-sqlite3 \
-    php84-tokenizer && \
+    php85-ftp \
+    php85-gd \
+    php85-intl \
+    php85-ldap \
+    php85-mysqli \
+    php85-pdo_mysql \
+    php85-pdo_sqlite \
+    php85-sqlite3 \
+    php85-tokenizer && \
   echo "**** install xbackbone ****" && \
     mkdir -p /app/www/public && \
   if [ -z ${XBACKBONE_RELEASE+x} ]; then \
diff --git a/README.md b/README.md
index 310d6e8..7f6812d 100644
--- a/README.md
+++ b/README.md
@@ -286,6 +286,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.07.26:** - Rebase to Alpine 3.24.
+* **09.07.25:** - Rebase to Alpine 3.22.
 * **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **28.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **25.12.23:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
diff --git a/readme-vars.yml b/readme-vars.yml
index f63f6ec..5b17142 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -90,6 +90,8 @@ init_diagram: |
   "xbackbone:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "05.07.26:", desc: "Rebase to Alpine 3.24."}
+  - {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
   - {date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}