From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
docker/docker-compose.yml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4a720b6..d40ae29 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -76,7 +76,7 @@
ipv4_address: 172.30.0.48
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -89,7 +89,7 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.4.0"
+ image: "ruoyi/ruoyi-server:2.5.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -101,6 +101,16 @@
ruoyi_net:
ipv4_address: 172.30.0.61
+ ruoyi-monitor-admin:
+ image: "ruoyi/ruoyi-monitor-admin:2.5.0"
+ environment:
+ - TZ=Asia/Shanghai
+ privileged: true
+ restart: always
+ networks:
+ ruoyi_net:
+ ipv4_address: 172.30.0.90
+
networks:
ruoyi_net:
driver: bridge
--
Gitblit v1.9.3