From 015b4060011ed00262369d49fc36d420f2f040a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 25 十月 2024 11:09:23 +0800
Subject: [PATCH] !591 发布 5.2.3 正式版 Merge pull request !591 from 疯狂的狮子Li/dev
---
script/docker/docker-compose.yml | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 346cf20..0839e74 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -2,7 +2,7 @@
services:
mysql:
- image: mysql:8.0.29
+ image: mysql:8.0.33
container_name: mysql
environment:
# 鏃跺尯涓婃捣
@@ -29,7 +29,7 @@
network_mode: "host"
nginx-web:
- image: nginx:1.22.1
+ image: nginx:1.23.4
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
@@ -50,7 +50,7 @@
network_mode: "host"
redis:
- image: redis:6.2.7
+ image: redis:6.2.12
container_name: redis
ports:
- "6379:6379"
@@ -67,7 +67,7 @@
network_mode: "host"
minio:
- image: minio/minio:RELEASE.2022-05-26T05-48-41Z
+ image: minio/minio:RELEASE.2023-04-13T03-08-07Z
container_name: minio
ports:
# api 绔彛
@@ -78,9 +78,9 @@
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
# 绠＄悊鍚庡彴鐢ㄦ埛鍚�
- MINIO_ACCESS_KEY: ruoyi
+ MINIO_ROOT_USER: ruoyi
# 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
- MINIO_SECRET_KEY: ruoyi123
+ MINIO_ROOT_PASSWORD: ruoyi123
# https闇�瑕佹寚瀹氬煙鍚�
#MINIO_SERVER_URL: "https://xxx.com:9000"
#MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
@@ -100,7 +100,7 @@
network_mode: "host"
ruoyi-server1:
- image: ruoyi/ruoyi-server:4.3.0
+ image: ruoyi/ruoyi-server:5.2.3
container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
@@ -109,11 +109,13 @@
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
ruoyi-server2:
- image: "ruoyi/ruoyi-server:4.3.0"
+ image: ruoyi/ruoyi-server:5.2.3
container_name: ruoyi-server2
environment:
# 鏃跺尯涓婃捣
@@ -122,11 +124,13 @@
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor-admin:4.3.0
+ image: ruoyi/ruoyi-monitor-admin:5.2.3
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -137,14 +141,16 @@
privileged: true
network_mode: "host"
- ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:4.3.0
- container_name: ruoyi-xxl-job-admin
+ ruoyi-snailjob-server:
+ image: ruoyi/ruoyi-snailjob-server:5.2.3
+ container_name: ruoyi-snailjob-server
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ ports:
+ - "8800:8800"
+ - "17888:17888"
volumes:
- # 閰嶇疆鏂囦欢
- - /docker/xxljob/logs/:/ruoyi/xxljob/logs
+ - /docker/snailjob/logs/:/ruoyi/snailjob/logs
privileged: true
network_mode: "host"
--
Gitblit v1.9.3