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 | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b08c32d..7e5f32f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,8 +18,6 @@
- /docker/mysql/data/:/var/lib/mysql/
# 閰嶇疆鎸傝浇
- /docker/mysql/conf/:/etc/mysql/conf.d/
- # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
- - /etc/localtime:/etc/localtime:ro
command:
# 灏唌ysql8.0榛樿瀵嗙爜绛栫暐 淇敼涓� 鍘熷厛 绛栫暐 (mysql8.0瀵瑰叾榛樿绛栫暐鍋氫簡鏇存敼 浼氬鑷村瘑鐮佹棤娉曞尮閰�)
--default-authentication-plugin=mysql_native_password
@@ -37,6 +35,9 @@
# 濡傛灉闇�瑕佹寚瀹氱増鏈� 灏辨妸 latest 鎹㈡垚鐗堟湰鍙�
image: nginx:latest
container_name: nginx-web
+ environment:
+ # 鏃跺尯涓婃捣
+ TZ: Asia/Shanghai
ports:
- 80:80
- 443:443
@@ -49,8 +50,6 @@
- /docker/nginx/html:/usr/share/nginx/html
# 鏃ュ織鐩綍
- /docker/nginx/log:/var/log/nginx
- # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
- - /etc/localtime:/etc/localtime:ro
privileged: true
restart: always
networks:
@@ -62,17 +61,14 @@
ports:
- 6379:6379
environment:
- # 璁剧疆鐜鍙橀噺 鏃跺尯涓婃捣 缂栫爜UTF-8
+ # 鏃跺尯涓婃捣
TZ: Asia/Shanghai
- LANG: en_US.UTF-8
volumes:
# 閰嶇疆鏂囦欢
- - /docker/redis/conf/redis.conf:/redis.conf:rw
+ - /docker/redis/conf:/redis/config:rw
# 鏁版嵁鏂囦欢
- - /docker/redis/data:/data:rw
- # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
- - /etc/localtime:/etc/localtime:ro
- 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:
@@ -81,13 +77,15 @@
minio:
image: minio/minio:RELEASE.2021-07-08T01-15-01Z
- hostname: "minio"
+ container_name: minio
ports:
# api 绔彛
- 9000:9000
# 鎺у埗鍙扮鍙�
- 9001:9001
environment:
+ # 鏃跺尯涓婃捣
+ TZ: Asia/Shanghai
# 绠＄悊鍚庡彴鐢ㄦ埛鍚�
MINIO_ACCESS_KEY: ruoyi
# 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
@@ -97,8 +95,6 @@
- /docker/minio/data:/data
# 鏄犲皠閰嶇疆鐩綍
- /docker/minio/config:/root/.minio/
- # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
- - /etc/localtime:/etc/localtime:ro
command: server --console-address ':9001' /data # 鎸囧畾瀹瑰櫒涓殑鐩綍 /data
privileged: true
restart: always
@@ -107,13 +103,14 @@
ipv4_address: 172.30.0.54
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.5.1"
+ image: "ruoyi/ruoyi-server:3.2.0"
+ container_name: ruoyi-server1
environment:
- - TZ=Asia/Shanghai
+ # 鏃跺尯涓婃捣
+ TZ: Asia/Shanghai
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
- - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
privileged: true
restart: always
networks:
@@ -121,13 +118,14 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.5.1"
+ image: "ruoyi/ruoyi-server:3.2.0"
+ container_name: ruoyi-server2
environment:
- - TZ=Asia/Shanghai
+ # 鏃跺尯涓婃捣
+ TZ: Asia/Shanghai
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
- - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
privileged: true
restart: always
networks:
@@ -135,15 +133,35 @@
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.5.1"
+ image: "ruoyi/ruoyi-monitor-admin:3.2.0"
+ container_name: ruoyi-monitor-admin
environment:
- - TZ=Asia/Shanghai
+ # 鏃跺尯涓婃捣
+ 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