From 6f9fb3f2fc907037000d3ee04ed0493010f06676 Mon Sep 17 00:00:00 2001
From: Jonathan Visser <jonathan.visser@team.blue>
Date: Wed, 7 Jan 2026 13:06:20 +0100
Subject: [PATCH 1/2] Add support for PHP 8.5 image

---
 .github/workflows/publish.yaml | 6 ++++--
 .github/workflows/test.yaml    | 4 ++--
 ci/build/Dockerfile            | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 380fb91..2189343 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -12,17 +12,19 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         node_version:
           - 16
           - 18
           - 20
           - 22
+          - 24
     runs-on: ubuntu-latest
     env:
       PHP_VERSION: ${{ matrix.php_version }}
       NODE_VERSION: ${{ matrix.node_version }}
-      LATEST_PHP_VERSION: 8.4
-      LATEST_NODE_VERSION: 22
+      LATEST_PHP_VERSION: 8.5
+      LATEST_NODE_VERSION: 24
     steps:
       - name: Checkout hypernode-deploy
         uses: actions/checkout@v3
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8af02f0..8a5734a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ jobs:
   integration_test:
     strategy:
       matrix:
-        php_version: [8.1, 8.2, 8.3, 8.4]
+        php_version: [8.1, 8.2, 8.3, 8.4, 8.5]
         testsuite: [general, brancher]
     runs-on: ubuntu-latest
     steps:
@@ -34,7 +34,7 @@ jobs:
   code_quality:
     strategy:
       matrix:
-        php_version: [8.1, 8.2, 8.3, 8.4]
+        php_version: [8.1, 8.2, 8.3, 8.4, 8.5]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout hypernode-deploy
diff --git a/ci/build/Dockerfile b/ci/build/Dockerfile
index 2a5f7c0..fb888eb 100644
--- a/ci/build/Dockerfile
+++ b/ci/build/Dockerfile
@@ -26,7 +26,8 @@ RUN apt-get clean \
     && echo \
         "Package: * \
         Pin origin debian.hypernode.com \
-        Pin-Priority: 1000" > /etc/apt/preferences.d/hypernode
+        Pin-Priority: 1000" > /etc/apt/preferences.d/hypernode \
+    && apt update
 
 RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - 
 
@@ -71,7 +72,6 @@ RUN apt-get install -y --no-install-recommends \
         php${PHP_VERSION}-mbstring \
         php${PHP_VERSION}-mysql \
         php${PHP_VERSION}-odbc \
-        php${PHP_VERSION}-opcache \
         php${PHP_VERSION}-pgsql \
         php${PHP_VERSION}-pspell \
         php${PHP_VERSION}-readline \

From 31c0fc6f2c70e4bd3575fdf0831ac07676676875 Mon Sep 17 00:00:00 2001
From: Jonathan Visser <jonathan.visser@team.blue>
Date: Thu, 8 Jan 2026 10:20:14 +0100
Subject: [PATCH 2/2] Run bookworm tests for PHP 8.5

---
 ci/test/run-general.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test/run-general.sh b/ci/test/run-general.sh
index a82e1d0..51010d6 100755
--- a/ci/test/run-general.sh
+++ b/ci/test/run-general.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 export PHP_VERSION_SHORT=$(echo "${PHP_VERSION:-8.2}" | sed 's/\.//')
-if [[ "${PHP_VERSION:-8.2}" == "8.4" ]]; then
+if [[ "${PHP_VERSION:-8.2}" == "8.4" || "${PHP_VERSION:-8.2}" == "8.5" ]]; then
     export IMAGE_OS="bookworm"
 else
     export IMAGE_OS="buster"