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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9ce9613..d40ae29 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,8 +18,6 @@
- /docker/mysql/data/:/var/lib/mysql/
# 閰嶇疆鎸傝浇
- /docker/mysql/conf/:/etc/mysql/conf.d/
- # 鍒濆鍖栫洰褰曟寕杞�
- - /docker/mysql/init/:/docker-entrypoint-initdb.d/
command:
# 灏唌ysql8.0榛樿瀵嗙爜绛栫暐 淇敼涓� 鍘熷厛 绛栫暐 (mysql8.0瀵瑰叾榛樿绛栫暐鍋氫簡鏇存敼 浼氬鑷村瘑鐮佹棤娉曞尮閰�)
--default-authentication-plugin=mysql_native_password
@@ -77,15 +75,41 @@
ruoyi_net:
ipv4_address: 172.30.0.48
- ruoyi-admin:
- image: "${REGISTER}/ruoyi-admin:${TAG}"
+ ruoyi-server1:
+ image: "ruoyi/ruoyi-server:2.5.0"
+ environment:
+ - TZ=Asia/Shanghai
+ volumes:
+ # 閰嶇疆鏂囦欢
+ - /docker/server1/logs/:/ruoyi/server/logs/
+ privileged: true
+ restart: always
+ networks:
+ ruoyi_net:
+ ipv4_address: 172.30.0.60
+
+ ruoyi-server2:
+ image: "ruoyi/ruoyi-server:2.5.0"
+ environment:
+ - TZ=Asia/Shanghai
+ volumes:
+ # 閰嶇疆鏂囦欢
+ - /docker/server2/logs/:/ruoyi/server/logs/
+ privileged: true
+ restart: always
+ networks:
+ 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.60
+ ipv4_address: 172.30.0.90
networks:
ruoyi_net:
--
Gitblit v1.9.3