From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
docker/docker-compose.yml | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3413cf6..ac065c3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,6 +18,8 @@
- /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
@@ -68,6 +70,8 @@
- /docker/redis/conf/redis.conf:/redis.conf:rw
# 鏁版嵁鏂囦欢
- /docker/redis/data:/data:rw
+ # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
+ - /etc/localtime:/etc/localtime:ro
command: "redis-server --appendonly yes"
privileged: true
restart: always
@@ -75,8 +79,35 @@
ruoyi_net:
ipv4_address: 172.30.0.48
+ minio:
+ image: minio/minio:RELEASE.2021-07-08T01-15-01Z
+ hostname: "minio"
+ ports:
+ # api 绔彛
+ - 9000:9000
+ # 鎺у埗鍙扮鍙�
+ - 9001:9001
+ environment:
+ # 绠＄悊鍚庡彴鐢ㄦ埛鍚�
+ MINIO_ACCESS_KEY: ruoyi
+ # 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
+ MINIO_SECRET_KEY: ruoyi123
+ volumes:
+ # 鏄犲皠褰撳墠鐩綍涓嬬殑data鐩綍鑷冲鍣ㄥ唴/data鐩綍
+ - /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
+ networks:
+ ruoyi_net:
+ ipv4_address: 172.30.0.54
+
ruoyi-server1:
- image: "ruoyi/ruoyi-server:2.5.2"
+ image: "ruoyi/ruoyi-server:2.6.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -90,7 +121,7 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:2.5.2"
+ image: "ruoyi/ruoyi-server:2.6.0"
environment:
- TZ=Asia/Shanghai
volumes:
@@ -104,7 +135,7 @@
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:2.5.2"
+ image: "ruoyi/ruoyi-monitor-admin:2.6.0"
environment:
- TZ=Asia/Shanghai
privileged: true
--
Gitblit v1.9.3