From e145f21512fefc80dc779a705e6b23c42e33090e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Jul 2024 11:13:39 +0100
Subject: [PATCH] Dev compose: Set image versions, removed unsupported mysql
 flag

Quick local test performed, ran a working instance.
For #5124
---
 dev/docker/Dockerfile | 2 +-
 docker-compose.yml    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index fe497e9e63e..50d528fafb8 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.3-apache
 
 ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e2fdf700de..f4c3a64c664 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,13 +6,12 @@ volumes:
 
 services:
   db:
-    image: mysql:8
+    image: mysql:8.4
     environment:
       MYSQL_DATABASE: bookstack-dev
       MYSQL_USER: bookstack-test
       MYSQL_PASSWORD: bookstack-test
       MYSQL_RANDOM_ROOT_PASSWORD: 'true'
-    command: --default-authentication-plugin=mysql_native_password
     volumes:
       - ./dev/docker/init.db:/docker-entrypoint-initdb.d
       - db:/var/lib/mysql
@@ -41,7 +40,7 @@ services:
     extra_hosts:
     - "host.docker.internal:host-gateway"
   node:
-    image: node:alpine
+    image: node:22-alpine
     working_dir: /app
     user: node
     volumes: