From 4ce596aa9c2d74e58cb0789e30162a27fbd8701d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 一月 2023 20:44:22 +0800
Subject: [PATCH] !277 项目结构重构 Merge pull request !277 from MichelleChung/5.X
---
script/docker/docker-compose.yml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 9668c10..f0a4898 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.31
container_name: mysql
environment:
# 鏃跺尯涓婃捣
@@ -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.1
+ image: ruoyi/ruoyi-server:4.5.0
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.1"
+ image: "ruoyi/ruoyi-server:4.5.0"
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.1
+ image: ruoyi/ruoyi-monitor-admin:4.5.0
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -138,7 +142,7 @@
network_mode: "host"
ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:4.3.1
+ image: ruoyi/ruoyi-xxl-job-admin:4.5.0
container_name: ruoyi-xxl-job-admin
environment:
# 鏃跺尯涓婃捣
--
Gitblit v1.9.3