From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
script/docker/docker-compose.yml | 110 ++++++++++++++++++++++++-------------------------------
1 files changed, 48 insertions(+), 62 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index c73a93c..91d97ae 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -2,7 +2,7 @@
services:
mysql:
- image: mysql:8.0.24
+ image: mysql:8.0.33
container_name: mysql
environment:
# 鏃跺尯涓婃捣
@@ -12,7 +12,7 @@
# 鍒濆鍖栨暟鎹簱(鍚庣画鐨勫垵濮嬪寲sql浼氬湪杩欎釜搴撴墽琛�)
MYSQL_DATABASE: ry-vue
ports:
- - 3306:3306
+ - "3306:3306"
volumes:
# 鏁版嵁鎸傝浇
- /docker/mysql/data/:/var/lib/mysql/
@@ -26,21 +26,17 @@
--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:
- # 濡傛灉闇�瑕佹寚瀹氱増鏈� 灏辨妸 latest 鎹㈡垚鐗堟湰鍙�
- image: nginx:latest
+ image: nginx:1.23.4
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
ports:
- - 80:80
- - 443:443
+ - "80:80"
+ - "443:443"
volumes:
# 璇佷功鏄犲皠
- /docker/nginx/cert:/etc/nginx/cert
@@ -51,15 +47,13 @@
# 鏃ュ織鐩綍
- /docker/nginx/log:/var/log/nginx
privileged: true
- restart: always
- networks:
- - ruoyi_net
+ network_mode: "host"
redis:
- image: redis:6.2.1
+ image: redis:6.2.12
container_name: redis
ports:
- - 6379:6379
+ - "6379:6379"
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
@@ -67,73 +61,76 @@
# 閰嶇疆鏂囦欢
- /docker/redis/conf:/redis/config:rw
# 鏁版嵁鏂囦欢
- - /docker/redis/data:/redis/data:rw
- command: "redis-server /redis/config/redis.conf --appendonly yes"
+ - /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.2021-07-08T01-15-01Z
+ image: minio/minio:RELEASE.2023-04-13T03-08-07Z
container_name: minio
ports:
# api 绔彛
- - 9000:9000
+ - "9000:9000"
# 鎺у埗鍙扮鍙�
- - 9001:9001
+ - "9001:9001"
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
# 绠＄悊鍚庡彴鐢ㄦ埛鍚�
- MINIO_ACCESS_KEY: ruoyi
+ MINIO_ROOT_USER: ruoyi
# 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
- MINIO_SECRET_KEY: ruoyi123
+ MINIO_ROOT_PASSWORD: ruoyi123
+ # https闇�瑕佹寚瀹氬煙鍚�
+ #MINIO_SERVER_URL: "https://xxx.com:9000"
+ #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
+ # 寮�鍚帇缂� on 寮�鍚� off 鍏抽棴
+ MINIO_COMPRESS: "off"
+ # 鎵╁睍鍚� .pdf,.doc 涓虹┖ 鎵�鏈夌被鍨嬪潎鍘嬬缉
+ MINIO_COMPRESS_EXTENSIONS: ""
+ # mime 绫诲瀷 application/pdf 涓虹┖ 鎵�鏈夌被鍨嬪潎鍘嬬缉
+ MINIO_COMPRESS_MIME_TYPES: ""
volumes:
# 鏄犲皠褰撳墠鐩綍涓嬬殑data鐩綍鑷冲鍣ㄥ唴/data鐩綍
- /docker/minio/data:/data
# 鏄犲皠閰嶇疆鐩綍
- /docker/minio/config:/root/.minio/
- command: server --console-address ':9001' /data # 鎸囧畾瀹瑰櫒涓殑鐩綍 /data
+ 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:3.3.0"
+ image: ruoyi/ruoyi-server:5.2.2
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:3.3.0"
+ image: ruoyi/ruoyi-server:5.2.2
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:3.3.0"
+ image: ruoyi/ruoyi-monitor-admin:5.2.2
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -142,29 +139,18 @@
# 閰嶇疆鏂囦欢
- /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:3.3.0"
- container_name: ruoyi-xxl-job-admin
+ ruoyi-snailjob-server:
+ image: ruoyi/ruoyi-snailjob-server:5.2.2
+ container_name: ruoyi-snailjob-server
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ ports:
+ - "8800:8800"
+ - "17888:17888"
volumes:
- # 閰嶇疆鏂囦欢
- - /docker/xxljob/logs/:/ruoyi/xxljob/logs
+ - /docker/snailjob/logs/:/ruoyi/snailjob/logs
privileged: true
- restart: always
- networks:
- ruoyi_net:
- ipv4_address: 172.30.0.92
-
-networks:
- ruoyi_net:
- driver: bridge
- ipam:
- config:
- - subnet: 172.30.0.0/16
+ network_mode: "host"
--
Gitblit v1.9.3