From b12bdd1f15c562c7f99ce1588d9f950aaee79bbe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 18:56:46 +0800
Subject: [PATCH] 发布 v2.5.2 bug修复版

---
 docker/docker-compose.yml |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9ce9613..3413cf6 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,43 @@
       ruoyi_net:
         ipv4_address: 172.30.0.48
 
-  ruoyi-admin:
-    image: "${REGISTER}/ruoyi-admin:${TAG}"
+  ruoyi-server1:
+    image: "ruoyi/ruoyi-server:2.5.2"
+    environment:
+      - TZ=Asia/Shanghai
+    volumes:
+      # 閰嶇疆鏂囦欢
+      - /docker/server1/logs/:/ruoyi/server/logs/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
+    privileged: true
+    restart: always
+    networks:
+      ruoyi_net:
+        ipv4_address: 172.30.0.60
+
+  ruoyi-server2:
+    image: "ruoyi/ruoyi-server:2.5.2"
+    environment:
+      - TZ=Asia/Shanghai
+    volumes:
+      # 閰嶇疆鏂囦欢
+      - /docker/server2/logs/:/ruoyi/server/logs/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
+    privileged: true
+    restart: always
+    networks:
+      ruoyi_net:
+        ipv4_address: 172.30.0.61
+
+  ruoyi-monitor-admin:
+    image: "ruoyi/ruoyi-monitor-admin:2.5.2"
     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