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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 7f5f5b3..eb1ab69 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -141,14 +141,20 @@
privileged: true
network_mode: "host"
- ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:5.0.0
- 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