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/deploy.sh | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/docker/deploy.sh b/docker/deploy.sh
index bbfdaf4..3b6e696 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -2,7 +2,7 @@
#浣跨敤璇存槑锛岀敤鏉ユ彁绀鸿緭鍏ュ弬鏁�
usage() {
- echo "Usage: sh 鎵ц鑴氭湰.sh [port|mount|base|start|stop|stopall|rm|rmiNoneTag]"
+ echo "Usage: sh 鎵ц鑴氭湰.sh [port|mount|monitor|base|start|stop|stopall|rm|rmiNoneTag]"
exit 1
}
@@ -16,9 +16,9 @@
##鏀剧疆鎸傝浇鏂囦欢
mount(){
#鎸傝浇閰嶇疆鏂囦欢
- if test ! -f "/docker/nginx/nginx.conf" ;then
- mkdir -p /docker/nginx
- cp nginx/nginx.conf /docker/nginx/nginx.conf
+ if test ! -f "/docker/nginx/conf/nginx.conf" ;then
+ mkdir -p /docker/nginx/conf
+ cp nginx/nginx.conf /docker/nginx/conf/nginx.conf
fi
}
@@ -27,14 +27,19 @@
docker-compose up -d mysql nginx-web redis
}
+#鍚姩鍩虹妯″潡
+monitor(){
+ docker-compose up -d ruoyi-monitor-admin
+}
+
#鍚姩绋嬪簭妯″潡
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
}
#鍏抽棴鎵�鏈夋ā鍧�
@@ -63,14 +68,17 @@
"base")
base
;;
+"monitor")
+ monitor
+;;
"start")
- modules
+ start
;;
"stop")
- stopmodules
+ stop
;;
"stopall")
- stop
+ stopall
;;
"rm")
rm
--
Gitblit v1.9.3