From dcad0cdf92558caf3920b27f2c6cd5df2d146d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 8 Jul 2021 20:34:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=20=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=20=E9=9B=86=E7=BE=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/deploy.sh          |  4 ++--
 docker/docker-compose.yml | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docker/deploy.sh b/docker/deploy.sh
index 69b529a4..7fc79fdc 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -29,12 +29,12 @@ base(){
 
 #启动程序模块
 start(){
-	docker-compose up -d ruoyi-admin
+	docker-compose up -d ruoyi-server1 ruoyi-server2
 }
 
 #停止程序模块
 stop(){
-	docker-compose stop ruoyi-admin
+	docker-compose stop ruoyi-server1 ruoyi-server2
 }
 
 #关闭所有模块
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 93c18f4d..4a720b6d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -75,19 +75,32 @@ services:
       ruoyi_net:
         ipv4_address: 172.30.0.48
 
-  ruoyi-admin:
-    image: "ruoyi/ruoyi-admin:2.4.0"
+  ruoyi-server1:
+    image: "ruoyi/ruoyi-server:2.4.0"
     environment:
       - TZ=Asia/Shanghai
     volumes:
       # 配置文件
-      - /docker/server/logs/:/ruoyi/server/logs/
+      - /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.4.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
+
 networks:
   ruoyi_net:
     driver: bridge