From 737c91b321e3e2b23eb6e9623a01a7d302f76703 Mon Sep 17 00:00:00 2001
From: Jolly <lzy.jolly@gmail.com>
Date: Mon, 20 Oct 2025 00:42:02 +0800
Subject: [PATCH 1/7] Update Redis image version to 8.0-alpine

According to Redis offical Dockerhub, redis:7-alpine inclouds some Vulnerabilities (critical severity level).
Suggest change to 8.0-alpine
https://hub.docker.com/_/redis/tags
---
 compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index f4ecbfe..d18907e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -31,7 +31,7 @@ services:
     depends_on:
       - redis
   redis:
-    image: redis:7-alpine
+    image: redis:8.0-alpine
     command: redis-server --unixsocket /data/redis.sock --unixsocketperm 777 --save 900 1 --save 300 10 --save 60 10000
     restart: unless-stopped
     volumes:

From 421d244a6205f79fcccd2db0992a3e7a0365930d Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Sun, 15 Mar 2026 10:55:35 +0800
Subject: [PATCH 2/7] Add ws-server service to Docker Compose configuration

---
 compose.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/compose.yaml b/compose.yaml
index d18907e..0980460 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -30,6 +30,22 @@ services:
     command: php artisan horizon
     depends_on:
       - redis
+  ws-server:
+    image: ghcr.io/cedar2025/xboard:new
+    volumes:
+      - ./.docker/.data/redis/:/data/
+      - ./.env:/www/.env
+      - ./.docker/.data/:/www/.docker/.data
+      - ./storage/logs:/www/storage/logs
+      - ./plugins:/www/plugins
+    restart: on-failure
+    # network_mode: host
+    command: php artisan ws-server start
+    depends_on:
+      - redis
+    restart: on-failure
+    ports:
+      - 8076:8076
   redis:
     image: redis:8.0-alpine
     command: redis-server --unixsocket /data/redis.sock --unixsocketperm 777 --save 900 1 --save 300 10 --save 60 10000

From 801dee957bfe945592ee78b75755d8e1af57c329 Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Sun, 15 Mar 2026 14:53:51 +0800
Subject: [PATCH 3/7] fix: Remove duplicate restart configurations. #805

Duplicate restart policies have been removed from the service configuration.
---
 compose.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index 0980460..39d820b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -38,7 +38,6 @@ services:
       - ./.docker/.data/:/www/.docker/.data
       - ./storage/logs:/www/storage/logs
       - ./plugins:/www/plugins
-    restart: on-failure
     # network_mode: host
     command: php artisan ws-server start
     depends_on:

From b7ded2079ffd0f6d537ac54703c2b12c569bf8c0 Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Mon, 16 Mar 2026 02:52:46 +0800
Subject: [PATCH 4/7] Update Redis image version in compose.yaml

---
 compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index 39d820b..084d9b7 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -46,7 +46,7 @@ services:
     ports:
       - 8076:8076
   redis:
-    image: redis:8.0-alpine
+    image: redis:8-alpine
     command: redis-server --unixsocket /data/redis.sock --unixsocketperm 777 --save 900 1 --save 300 10 --save 60 10000
     restart: unless-stopped
     volumes:

From 332a1a7026d3fdf1e65a021ae75c7fb175b80bc6 Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Wed, 18 Mar 2026 21:01:55 +0800
Subject: [PATCH 5/7] Add redis-data volume to compose.yaml

---
 compose.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose.yaml b/compose.yaml
index 084d9b7..94d4040 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -51,3 +51,5 @@ services:
     restart: unless-stopped
     volumes:
       - ./.docker/.data/redis:/data
+volumes:
+  redis-data:

From 78130dd3006cb3af0f37bd697ac2e6522e9e3359 Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Wed, 18 Mar 2026 21:04:56 +0800
Subject: [PATCH 6/7] Update compose.yaml

---
 compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index 94d4040..2b308b5 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -50,6 +50,6 @@ services:
     command: redis-server --unixsocket /data/redis.sock --unixsocketperm 777 --save 900 1 --save 300 10 --save 60 10000
     restart: unless-stopped
     volumes:
-      - ./.docker/.data/redis:/data
+      - redis-data:/data
 volumes:
   redis-data:

From 921cca0855dc5afb2c1ed5d69e6c12e9535489a1 Mon Sep 17 00:00:00 2001
From: Xboard <147830212+cedar2025@users.noreply.github.com>
Date: Wed, 18 Mar 2026 21:16:00 +0800
Subject: [PATCH 7/7] fix: Replace local Redis volume with named volume

---
 compose.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 2b308b5..043eac7 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,7 +2,7 @@ services:
   web:
     image: ghcr.io/cedar2025/xboard:new
     volumes:
-      - ./.docker/.data/redis/:/data/
+      - redis-data:/data
       - ./.env:/www/.env
       - ./.docker/.data/:/www/.docker/.data
       - ./storage/logs:/www/storage/logs
@@ -20,7 +20,7 @@ services:
   horizon:
     image: ghcr.io/cedar2025/xboard:new
     volumes:
-      - ./.docker/.data/redis/:/data/
+      - redis-data:/data
       - ./.env:/www/.env
       - ./.docker/.data/:/www/.docker/.data
       - ./storage/logs:/www/storage/logs
@@ -33,7 +33,7 @@ services:
   ws-server:
     image: ghcr.io/cedar2025/xboard:new
     volumes:
-      - ./.docker/.data/redis/:/data/
+      - redis-data:/data
       - ./.env:/www/.env
       - ./.docker/.data/:/www/.docker/.data
       - ./storage/logs:/www/storage/logs