From b86367fd69471e70d3174d18c1e0389bc51fc1e4 Mon Sep 17 00:00:00 2001
From: WP Studio <info@wpstudio.ru>
Date: Thu, 22 Oct 2026 15:40:48 +0300
Subject: [PATCH] + php85

---
 bash/enter-to-workspace.sh                           | 2 +-
 src/docker-compose.yml                               | 6 ++++++
 src/dockerfiles/php/fpm/php85.Dockerfile             | 8 ++++++++
 src/dockerfiles/php/workspace/workspace85.Dockerfile | 9 +++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/dockerfiles/php/fpm/php85.Dockerfile
 create mode 100644 src/dockerfiles/php/workspace/workspace85.Dockerfile

diff --git a/bash/enter-to-workspace.sh b/bash/enter-to-workspace.sh
index 3ce059e..d3a8992 100755
--- a/bash/enter-to-workspace.sh
+++ b/bash/enter-to-workspace.sh
@@ -7,7 +7,7 @@ SCRIPT_DIR="$(realpath $(dirname "$(readlink -f "$0")"))"
 
 PHP_VERSION=$1 # Without dot
 
-if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=81; fi
+if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=82; fi
 
 CONTAINER=$(docker ps | grep workspace${PHP_VERSION} | awk '{print $1}')
 
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 6e5a9f5..d058a48 100755
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -29,6 +29,12 @@ services:
       service: php-fpm
     build:
       dockerfile: fpm/php84.Dockerfile
+  php85:
+    extends:
+      file: docker-compose.base.yml
+      service: php-fpm
+    build:
+      dockerfile: fpm/php85.Dockerfile
   workspace74:
     extends:
       file: docker-compose.base.yml
diff --git a/src/dockerfiles/php/fpm/php85.Dockerfile b/src/dockerfiles/php/fpm/php85.Dockerfile
new file mode 100644
index 0000000..129206b
--- /dev/null
+++ b/src/dockerfiles/php/fpm/php85.Dockerfile
@@ -0,0 +1,8 @@
+# syntax = edrevo/dockerfile-plus
+FROM php:8.5-fpm
+
+INCLUDE+ ./fpm/php.base.Dockerfile
+
+ARG XDEBUG_INI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
+
+COPY ./xdebug3.ini ${XDEBUG_INI_PATH}
diff --git a/src/dockerfiles/php/workspace/workspace85.Dockerfile b/src/dockerfiles/php/workspace/workspace85.Dockerfile
new file mode 100644
index 0000000..688738f
--- /dev/null
+++ b/src/dockerfiles/php/workspace/workspace85.Dockerfile
@@ -0,0 +1,9 @@
+# syntax = edrevo/dockerfile-plus
+FROM laradock/workspace:latest-8.5
+
+ARG PHP_VERSION=8.5
+ENV PHP_VERSION ${PHP_VERSION}
+
+INCLUDE+ ./workspace/workspace.base.Dockerfile
+
+INCLUDE+ ./workspace/xdebug3.Dockerfile