From 4d02466fed4f3ea012a80c3359cde9af0737141f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 20:01:12 +0800
Subject: [PATCH] add 增加 skywalking 集成 默认注释不开启
---
script/docker/docker-compose.yml | 65 ++++++++++----------------------
1 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 1181e7b..9cbb527 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -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.22.1
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
@@ -50,9 +47,7 @@
# 鏃ュ織鐩綍
- /docker/nginx/log:/var/log/nginx
privileged: true
- restart: always
- networks:
- - ruoyi_net
+ network_mode: "host"
redis:
image: redis:6.2.7
@@ -69,10 +64,7 @@
- /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
@@ -90,7 +82,8 @@
# 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
MINIO_SECRET_KEY: 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.1.0
+ image: ruoyi/ruoyi-server:4.3.1
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.1.0"
+ image: "ruoyi/ruoyi-server:4.3.1"
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.1.0
+ image: ruoyi/ruoyi-monitor-admin:4.3.1
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -149,13 +139,10 @@
# 閰嶇疆鏂囦欢
- /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.1.0
+ image: ruoyi/ruoyi-xxl-job-admin:4.3.1
container_name: ruoyi-xxl-job-admin
environment:
# 鏃跺尯涓婃捣
@@ -164,14 +151,4 @@
# 閰嶇疆鏂囦欢
- /docker/xxljob/logs/:/ruoyi/xxljob/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