From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
script/docker/docker-compose.yml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/docker/docker-compose.yml b/script/docker/docker-compose.yml
similarity index 89%
rename from docker/docker-compose.yml
rename to script/docker/docker-compose.yml
index e676d56..7e5f32f 100644
--- a/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -138,12 +138,30 @@
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ volumes:
+ # 閰嶇疆鏂囦欢
+ - /docker/monitor/logs/:/ruoyi/monitor/logs
privileged: true
restart: always
networks:
ruoyi_net:
ipv4_address: 172.30.0.90
+ ruoyi-xxl-job-admin:
+ image: "ruoyi/ruoyi-xxl-job-admin:3.2.0"
+ container_name: ruoyi-xxl-job-admin
+ environment:
+ # 鏃跺尯涓婃捣
+ TZ: Asia/Shanghai
+ volumes:
+ # 閰嶇疆鏂囦欢
+ - /docker/xxljob/logs/:/ruoyi/xxljob/logs
+ privileged: true
+ restart: always
+ networks:
+ ruoyi_net:
+ ipv4_address: 172.30.0.92
+
networks:
ruoyi_net:
driver: bridge
--
Gitblit v1.9.3