From 11415d4826516cd8d042622cc2aaf1fd60dde2d5 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Tue, 14 Jul 2026 21:10:10 +0000
Subject: [PATCH] Rebase to 3.24

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

diff --git a/Dockerfile b/Dockerfile
index 8040a60..deed616 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
@@ -16,15 +16,16 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     imagemagick \
-    php84-bz2 \
-    php84-dom \
-    php84-gd \
-    php84-ldap \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pecl-imagick \
-    php84-sqlite3 && \
+    php85-bz2 \
+    php85-dom \
+    php85-gd \
+    php85-ldap \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pecl-imagick \
+    php85-sqlite3 \
+    php85-tokenizer && \
   echo "**** install dokuwiki ****" && \
   if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
     DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d9d8635..9ab6949 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
@@ -16,15 +16,16 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     imagemagick \
-    php84-bz2 \
-    php84-dom \
-    php84-gd \
-    php84-ldap \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pecl-imagick \
-    php84-sqlite3 && \
+    php85-bz2 \
+    php85-dom \
+    php85-gd \
+    php85-ldap \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pecl-imagick \
+    php85-sqlite3 \
+    php85-tokenizer && \
   echo "**** install dokuwiki ****" && \
   if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
     DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
diff --git a/README.md b/README.md
index df51465..3ad51e9 100644
--- a/README.md
+++ b/README.md
@@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.07.26:** - Rebase to Alpine 3.24, add php-tokenizer.
 * **05.07.25:** - Rebase to Alpine 3.22.
 * **10.05.25:** - Rebase to Alpine 3.21.
 * **31.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
diff --git a/readme-vars.yml b/readme-vars.yml
index 3472829..3237b8d 100755
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -85,6 +85,7 @@ init_diagram: |
   "dokuwiki:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "14.07.26:", desc: "Rebase to Alpine 3.24, add php-tokenizer."}
   - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "10.05.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "31.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}