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 | 91 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 54 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index a02fe5d..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:
# 鏃跺尯涓婃捣
@@ -26,13 +26,10 @@
--explicit_defaults_for_timestamp=true
--lower_case_table_names=1
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.36
+ network_mode: "host"
nginx-web:
- image: nginx:1.21.6
+ image: nginx:1.23.4
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
@@ -50,12 +47,10 @@
# 鏃ュ織鐩綍
- /docker/nginx/log:/var/log/nginx
privileged: true
- restart: always
- networks:
- - ruoyi_net
+ network_mode: "host"
redis:
- image: redis:6.2.7
+ image: redis:6.2.12
container_name: redis
ports:
- "6379:6379"
@@ -69,13 +64,10 @@
- /docker/redis/data/:/redis/data/:rw
command: "redis-server /redis/config/redis.conf"
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.48
+ 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 绔彛
@@ -86,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 涓虹┖ 鎵�鏈夌被鍨嬪潎鍘嬬缉
@@ -104,43 +97,40 @@
- /docker/minio/config:/root/.minio/
command: server --address ':9000' --console-address ':9001' /data # 鎸囧畾瀹瑰櫒涓殑鐩綍 /data
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.54
+ network_mode: "host"
ruoyi-server1:
- image: ruoyi/ruoyi-server:4.2.0-beta1
+ image: ruoyi/ruoyi-server:5.0.0
container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ SERVER_PORT: 8080
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.60
+ network_mode: "host"
ruoyi-server2:
- image: "ruoyi/ruoyi-server:4.2.0-beta1"
+ image: ruoyi/ruoyi-server:5.0.0
container_name: ruoyi-server2
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ SERVER_PORT: 8081
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
+ # skywalking 鎺㈤拡
+# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.61
+ network_mode: "host"
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor-admin:4.2.0-beta1
+ image: ruoyi/ruoyi-monitor-admin:5.0.0
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -149,29 +139,22 @@
# 閰嶇疆鏂囦欢
- /docker/monitor/logs/:/ruoyi/monitor/logs
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.90
+ network_mode: "host"
- ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:4.2.0-beta1
- 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
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.92
+ network_mode: "host"
-networks:
- ruoyi_net:
- driver: bridge
- ipam:
- config:
- - subnet: 172.30.0.0/16
--
Gitblit v1.9.3