update 配置 monitor-admin docker编排

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
 }
 
@@ -27,6 +27,11 @@ base(){
 	docker-compose up -d mysql nginx-web redis
 }
 
+#启动基础模块
+monitor(){
+	docker-compose up -d ruoyi-monitor-admin
+}
+
 #启动程序模块
 start(){
 	docker-compose up -d ruoyi-server1 ruoyi-server2
@@ -63,6 +68,9 @@ case "$1" in
 "base")
 	base
 ;;
+"monitor")
+	monitor
+;;
 "start")
 	start
 ;;

docker/docker-compose.yml

@@ -101,6 +101,16 @@ services:
       ruoyi_net:
         ipv4_address: 172.30.0.61
 
+  ruoyi-monitor-admin:
+    image: "ruoyi/ruoyi-monitor-admin:2.4.0"
+    environment:
+      - TZ=Asia/Shanghai
+    privileged: true
+    restart: always
+    networks:
+      ruoyi_net:
+        ipv4_address: 172.30.0.90
+
 networks:
   ruoyi_net:
     driver: bridge

docker/nginx/nginx.conf

@@ -26,6 +26,10 @@ http {
 		server 172.30.0.61:8080;
 	}
 
+    upstream monitor-admin {
+        server 172.30.0.90:9090;
+    }
+
     server {
         listen       80;
         server_name  localhost;
@@ -62,7 +66,7 @@ http {
 			proxy_set_header X-Real-IP $remote_addr;
 			proxy_set_header REMOTE-HOST $remote_addr;
 			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-			proxy_pass http://server/admin/;
+			proxy_pass http://monitor-admin/admin/;
 		}
 
         error_page   500 502 503 504  /50x.html;