From 02f191816729c09c19b7d54be4d64e0ccc970922 Mon Sep 17 00:00:00 2001
From: andytson-inviqa <andytson-inviqa@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:48:14 +0100
Subject: [PATCH 1/2] feat: add PHP 8.5

currently rc, but to help establish which extensions aren't ready
---
 Jenkinsfile        |  2 +-
 docker-compose.yml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bc09a05..c0a3210 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
                 axes {
                     axis {
                         name 'BUILD'
-                        values 'php81', 'php82', 'php83', 'php84'
+                        values 'php85'
                     }
                     axis {
                         name 'PLATFORM'
diff --git a/docker-compose.yml b/docker-compose.yml
index 3bdd206..b56e644 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,6 +56,16 @@ services:
         REDIS_VERSION: "7.4"
         BASEOS: bookworm
 
+  php85-fpm-bookworm-base:
+    image: my127/php:8.5-fpm-bookworm${TAG_SUFFIX:-}
+    build:
+      context: ./
+      target: base
+      args:
+        VERSION: "8.5-rc"
+        REDIS_VERSION: "7.4"
+        BASEOS: bookworm
+
   # Console Images
   php81-fpm-bullseye-console:
     image: my127/php:8.1-fpm-bullseye-console${TAG_SUFFIX:-}
@@ -122,3 +132,14 @@ services:
         COMPOSER_VERSION: "2.8.12"
         REDIS_VERSION: "7.4"
         BASEOS: bookworm
+
+  php85-fpm-bookworm-console:
+    image: my127/php:8.5-fpm-bookworm-console${TAG_SUFFIX:-}
+    build:
+      context: ./
+      target: console
+      args:
+        VERSION: "8.5-rc"
+        COMPOSER_VERSION: "2.8.12"
+        REDIS_VERSION: "7.4"
+        BASEOS: bookworm

From 627e9ab5a3f842a3d81cee35d13b5661b5545d0a Mon Sep 17 00:00:00 2001
From: andytson-inviqa <andytson-inviqa@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:12:50 +0000
Subject: [PATCH 2/2] switch to stable release

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b56e644..b5b06e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,7 +62,7 @@ services:
       context: ./
       target: base
       args:
-        VERSION: "8.5-rc"
+        VERSION: "8.5"
         REDIS_VERSION: "7.4"
         BASEOS: bookworm
 
@@ -139,7 +139,7 @@ services:
       context: ./
       target: console
       args:
-        VERSION: "8.5-rc"
+        VERSION: "8.5"
         COMPOSER_VERSION: "2.8.12"
         REDIS_VERSION: "7.4"
         BASEOS: bookworm