From 8ac2e21838a4dd34764822c525e3d910b1034224 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Sun, 28 Dec 2025 22:01:22 +0000
Subject: [PATCH] Rebase to 3.23

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

diff --git a/Dockerfile b/Dockerfile
index d2a2a0e..6b3782a 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.23
 
 # set version label
 ARG BUILD_DATE
@@ -21,17 +21,16 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add --no-cache \
-    php84-bz2 \
-    php84-dom \
-    php84-gd \
-    php84-mysqli \
-    php84-opcache \
-    php84-pecl-uploadprogress \
-    php84-tokenizer && \
+    php85-bz2 \
+    php85-dom \
+    php85-gd \
+    php85-mysqli \
+    php85-pecl-uploadprogress \
+    php85-tokenizer && \
   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 "**** setup php opcache ****" && \
   { \
       echo 'opcache.memory_consumption=128'; \
@@ -39,12 +38,12 @@ RUN \
       echo 'opcache.max_accelerated_files=4000'; \
       echo 'opcache.revalidate_freq=2'; \
       echo 'opcache.fast_shutdown=1'; \
-  } > /etc/php84/conf.d/opcache-recommended.ini; \
+  } > /etc/php85/conf.d/opcache-recommended.ini; \
   \
   { \
       echo 'session.cookie_httponly=1'; \
       echo 'session.use_strict_mode=1'; \
-  } > /etc/php84/conf.d/session-strict.ini; \
+  } > /etc/php85/conf.d/session-strict.ini; \
   \
   { \
       echo 'allow_url_fopen=Off'; \
@@ -53,7 +52,7 @@ RUN \
       echo 'memory_limit=${MEMORY_LIMIT}'; \
       echo 'post_max_size=${UPLOAD_LIMIT}'; \
       echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
-  } > /etc/php84/conf.d/phpmyadmin-misc.ini && \
+  } > /etc/php85/conf.d/phpmyadmin-misc.ini && \
   echo "**** install phpmyadmin ****" && \
   mkdir -p /app/www/public && \
   if [ -z ${PHPMYADMIN_VERSION+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8511001..eacb3e6 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.23
 
 # set version label
 ARG BUILD_DATE
@@ -21,17 +21,16 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add --no-cache \
-    php84-bz2 \
-    php84-dom \
-    php84-gd \
-    php84-mysqli \
-    php84-opcache \
-    php84-pecl-uploadprogress \
-    php84-tokenizer && \
+    php85-bz2 \
+    php85-dom \
+    php85-gd \
+    php85-mysqli \
+    php85-pecl-uploadprogress \
+    php85-tokenizer && \
   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 "**** setup php opcache ****" && \
   { \
       echo 'opcache.memory_consumption=128'; \
@@ -39,12 +38,12 @@ RUN \
       echo 'opcache.max_accelerated_files=4000'; \
       echo 'opcache.revalidate_freq=2'; \
       echo 'opcache.fast_shutdown=1'; \
-  } > /etc/php84/conf.d/opcache-recommended.ini; \
+  } > /etc/php85/conf.d/opcache-recommended.ini; \
   \
   { \
       echo 'session.cookie_httponly=1'; \
       echo 'session.use_strict_mode=1'; \
-  } > /etc/php84/conf.d/session-strict.ini; \
+  } > /etc/php85/conf.d/session-strict.ini; \
   \
   { \
       echo 'allow_url_fopen=Off'; \
@@ -53,7 +52,7 @@ RUN \
       echo 'memory_limit=${MEMORY_LIMIT}'; \
       echo 'post_max_size=${UPLOAD_LIMIT}'; \
       echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
-  } > /etc/php84/conf.d/phpmyadmin-misc.ini && \
+  } > /etc/php85/conf.d/phpmyadmin-misc.ini && \
   echo "**** install phpmyadmin ****" && \
   mkdir -p /app/www/public && \
   if [ -z ${PHPMYADMIN_VERSION+x} ]; then \
diff --git a/README.md b/README.md
index f049ddc..425cf84 100644
--- a/README.md
+++ b/README.md
@@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.12.25:** - Rebase to Alpine 3.23.
 * **23.08.25:** - Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container.
 * **05.07.25:** - Rebase to Alpine 3.22.
 * **19.12.24:** - Rebase to Alpine 3.21.
diff --git a/readme-vars.yml b/readme-vars.yml
index 4303e43..aea22d6 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -95,6 +95,7 @@ init_diagram: |
   "phpmyadmin:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
   - {date: "23.08.25:", desc: "Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container."}
   - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "19.12.24:", desc: "Rebase to Alpine 3.21."}