From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
docker/docker-compose.yml | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 228ddbf..7e5f32f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -65,10 +65,10 @@
TZ: Asia/Shanghai
volumes:
# 閰嶇疆鏂囦欢
- - /docker/redis/conf/redis.conf:/redis.conf:rw
+ - /docker/redis/conf:/redis/config:rw
# 鏁版嵁鏂囦欢
- - /docker/redis/data:/data:rw
- command: "redis-server --appendonly yes"
+ - /docker/redis/data:/redis/data:rw
+ command: "redis-server /redis/config/redis.conf --appendonly yes"
privileged: true
restart: always
networks:
@@ -77,7 +77,7 @@
minio:
image: minio/minio:RELEASE.2021-07-08T01-15-01Z
- hostname: "minio"
+ container_name: minio
ports:
# api 绔彛
- 9000:9000
@@ -103,14 +103,14 @@
ipv4_address: 172.30.0.54
ruoyi-server1:
- image: "ruoyi/ruoyi-server:3.0.0"
+ image: "ruoyi/ruoyi-server:3.2.0"
+ container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
- - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
privileged: true
restart: always
networks:
@@ -118,14 +118,14 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:3.0.0"
+ image: "ruoyi/ruoyi-server:3.2.0"
+ container_name: ruoyi-server2
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
- - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
privileged: true
restart: always
networks:
@@ -133,16 +133,35 @@
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:3.0.0"
+ image: "ruoyi/ruoyi-monitor-admin:3.2.0"
+ container_name: ruoyi-monitor-admin
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