From 35ad3067307e40b89d3ea8c131ac35c17f62ff1c Mon Sep 17 00:00:00 2001
From: 三个三 <2029364173@qq.com>
Date: 星期六, 17 六月 2023 23:13:02 +0800
Subject: [PATCH] Merge branch '5.X' of gitee.com:dromara/RuoYi-Vue-Plus into JustAuth
---
script/docker/docker-compose.yml | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 57a7359..eb1ab69 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -2,7 +2,7 @@
services:
mysql:
- image: mysql:8.0.29
+ image: mysql:8.0.33
container_name: mysql
environment:
# 鏃跺尯涓婃捣
@@ -29,7 +29,7 @@
network_mode: "host"
nginx-web:
- image: nginx:1.21.6
+ image: nginx:1.23.4
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
@@ -50,7 +50,7 @@
network_mode: "host"
redis:
- image: redis:6.2.7
+ image: redis:6.2.12
container_name: redis
ports:
- "6379:6379"
@@ -67,7 +67,7 @@
network_mode: "host"
minio:
- image: minio/minio:RELEASE.2022-05-26T05-48-41Z
+ image: minio/minio:RELEASE.2023-04-13T03-08-07Z
container_name: minio
ports:
# api 绔彛
@@ -78,11 +78,12 @@
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
# 绠＄悊鍚庡彴鐢ㄦ埛鍚�
- MINIO_ACCESS_KEY: ruoyi
+ MINIO_ROOT_USER: ruoyi
# 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
- MINIO_SECRET_KEY: ruoyi123
+ MINIO_ROOT_PASSWORD: ruoyi123
# https闇�瑕佹寚瀹氬煙鍚�
- MINIO_SERVER_URL: ""
+ #MINIO_SERVER_URL: "https://xxx.com:9000"
+ #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
# 寮�鍚帇缂� on 寮�鍚� off 鍏抽棴
MINIO_COMPRESS: "off"
# 鎵╁睍鍚� .pdf,.doc 涓虹┖ 鎵�鏈夌被鍨嬪潎鍘嬬缉
@@ -99,7 +100,7 @@
network_mode: "host"
ruoyi-server1:
- image: ruoyi/ruoyi-server:4.3.0-beta2
+ image: ruoyi/ruoyi-server:5.0.0
container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
@@ -108,11 +109,13 @@
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
ruoyi-server2:
- image: "ruoyi/ruoyi-server:4.3.0-beta2"
+ image: ruoyi/ruoyi-server:5.0.0
container_name: ruoyi-server2
environment:
# 鏃跺尯涓婃捣
@@ -121,11 +124,13 @@
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor-admin:4.3.0-beta2
+ image: ruoyi/ruoyi-monitor-admin:5.0.0
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -136,14 +141,20 @@
privileged: true
network_mode: "host"
- ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:4.3.0-beta2
- container_name: ruoyi-xxl-job-admin
+ ruoyi-powerjob-server:
+ image: powerjob/powerjob-server:latest
+ restart: always
+ depends_on:
+ - mysql
environment:
- # 鏃跺尯涓婃捣
- TZ: Asia/Shanghai
+ JVMOPTIONS: "-Xmx512m"
+ PARAMS: "--oms.mongodb.enable=false --spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai --spring.datasource.core.username=root --spring.datasource.core.password=root --oms.table-prefix=pj_"
+ ports:
+ - "7700:7700"
+ - "10086:10086"
+ - "10010:10010"
volumes:
- # 閰嶇疆鏂囦欢
- - /docker/xxljob/logs/:/ruoyi/xxljob/logs
+ - /docker/powerjob-data/powerjob-server:/root/powerjob/server/
privileged: true
network_mode: "host"
+
--
Gitblit v1.9.3