From 6c1e146bc17c51ed744aa289b20febe339703196 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 七月 2022 13:10:41 +0800
Subject: [PATCH] update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本
---
/dev/null | 14 ---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml | 8 -
script/docker/nginx/nginx.conf | 8 +-
ruoyi-admin/src/main/resources/application-prod.yml | 14 +-
script/docker/docker-compose.yml | 48 ++---------
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml | 22 ++---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml | 22 ++---
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml | 19 +++-
ruoyi-admin/Dockerfile | 6 +
pom.xml | 6 -
ruoyi-admin/src/main/resources/application.yml | 6
script/docker/database.yml | 8 +-
12 files changed, 67 insertions(+), 114 deletions(-)
diff --git a/pom.xml b/pom.xml
index c5ed42b..f49ba5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,8 +411,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -421,8 +419,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -434,8 +430,6 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
- <knife4j.production>true</knife4j.production>
- <endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
</profiles>
diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index 1bbd2cc..7bb2b0d 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -8,8 +8,10 @@
WORKDIR /ruoyi/server
-EXPOSE 8080
+ENV SERVER_PORT=8080
+
+EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-admin.jar ./app.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dserver.port=${SERVER_PORT}","-jar", "app.jar"]
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index def5f16..a42f4ad 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
- url: http://172.30.0.90:9090/admin
+ url: http://localhost:9090/admin
instance:
service-host-type: IP
username: ruoyi
@@ -16,7 +16,7 @@
# 鎵ц鍣ㄥ紑鍏�
enabled: true
# 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
- admin-addresses: http://172.30.0.92:9100/xxl-job-admin
+ admin-addresses: http://localhost:9100/xxl-job-admin
# 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
access-token: xxl-job
executor:
@@ -51,7 +51,7 @@
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
- url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root
password: root
# 浠庡簱鏁版嵁婧�
@@ -63,19 +63,19 @@
password:
# oracle:
# driverClassName: oracle.jdbc.OracleDriver
-# url: jdbc:oracle:thin:@//172.30.0.36:1521/XE
+# url: jdbc:oracle:thin:@//localhost:1521/XE
# username: ROOT
# password: root
# druid:
# validationQuery: SELECT 1 FROM DUAL
# postgres:
# driverClassName: org.postgresql.Driver
-# url: jdbc:postgresql://172.30.0.36:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
# username: root
# password: root
# sqlserver:
# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://172.30.0.36:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
+# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
# username: SA
# password: root
druid:
@@ -128,7 +128,7 @@
spring:
redis:
# 鍦板潃
- host: 172.30.0.48
+ host: localhost
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 27482ac..25940ef 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -258,9 +258,9 @@
endpoints:
web:
exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: @endpoints.include@
+ include: '*'
endpoint:
+ health:
+ show-details: ALWAYS
logfile:
external-file: ./logs/sys-console.log
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
deleted file mode 100644
index 0b10bbd..0000000
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
---- # 鐩戞帶閰嶇疆
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
- client:
- # 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
- # 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://localhost:9090/admin
- instance:
- service-host-type: IP
- username: ruoyi
- password: 123456
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
deleted file mode 100644
index 2e02039..0000000
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,14 +0,0 @@
---- # 鐩戞帶閰嶇疆
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
- client:
- # 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
- # 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://172.30.0.90:9090/admin
- instance:
- service-host-type: IP
- username: ruoyi
- password: 123456
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 128a6f9..22ef1ab 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -22,12 +22,21 @@
management:
endpoints:
web:
- # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
- base-path: /actuator
exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: @endpoints.include@
+ include: '*'
endpoint:
+ health:
+ show-details: ALWAYS
logfile:
external-file: ./logs/ruoyi-monitor-admin.log
+
+--- # 鐩戞帶閰嶇疆
+spring.boot.admin.client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ # 璁剧疆 Spring Boot Admin Server 鍦板潃
+ url: http://localhost:9090/admin
+ instance:
+ service-host-type: IP
+ username: ruoyi
+ password: 123456
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
index 09ed519..fa04b56 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
@@ -1,17 +1,13 @@
--- # 鐩戞帶閰嶇疆
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
- client:
- # 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
- # 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://localhost:9090/admin
- instance:
- service-host-type: IP
- username: ruoyi
- password: 123456
+spring.boot.admin.client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ # 璁剧疆 Spring Boot Admin Server 鍦板潃
+ url: http://localhost:9090/admin
+ instance:
+ service-host-type: IP
+ username: ruoyi
+ password: 123456
--- # 鏁版嵁搴撻厤缃�
spring:
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index 401f60a..cd4057b 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -1,17 +1,13 @@
--- # 鐩戞帶閰嶇疆
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
- client:
- # 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
- # 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://172.30.0.90:9090/admin
- instance:
- service-host-type: IP
- username: ruoyi
- password: 123456
+spring.boot.admin.client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ # 璁剧疆 Spring Boot Admin Server 鍦板潃
+ url: http://localhost:9090/admin
+ instance:
+ service-host-type: IP
+ username: ruoyi
+ password: 123456
--- # 鏁版嵁搴撻厤缃�
spring:
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
index 2022720..d4fda93 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
@@ -37,13 +37,11 @@
enabled: false
endpoints:
web:
- # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
- base-path: /actuator
exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: @endpoints.include@
+ include: '*'
endpoint:
+ health:
+ show-details: ALWAYS
logfile:
external-file: ./logs/ruoyi-xxl-job-admin.log
diff --git a/script/docker/database.yml b/script/docker/database.yml
index 7a70b31..0368fd2 100644
--- a/script/docker/database.yml
+++ b/script/docker/database.yml
@@ -16,7 +16,7 @@
volumes:
# 鏁版嵁鎸傝浇
- "/docker/oracle/data:/u01/app/oracle"
- restart: always
+ network_mode: "host"
# 姝ら暅鍍忎粎鐢ㄤ簬娴嬭瘯 姝ｅ紡鐜闇�鑷瀹夎鏁版嵁搴�
sqlserver:
@@ -32,7 +32,7 @@
volumes:
# 鏁版嵁鎸傝浇
- "/docker/sqlserver/data:/var/opt/mssql"
- restart: always
+ network_mode: "host"
postgres:
image: postgres:14.2
@@ -45,7 +45,7 @@
- "5432:5432"
volumes:
- /docker/postgres/data:/var/lib/postgresql/data
- restart: always
+ network_mode: "host"
postgres13:
image: postgres:13.6
@@ -58,4 +58,4 @@
- "5433:5432"
volumes:
- /docker/postgres13/data:/var/lib/postgresql/data
- restart: always
+ network_mode: "host"
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 3dcdf32..41f97e4 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -26,10 +26,7 @@
--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
@@ -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
@@ -104,10 +96,7 @@
- /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
@@ -115,14 +104,12 @@
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ SERVER_PORT: 8080
volumes:
# 閰嶇疆鏂囦欢
- /docker/server1/logs/:/ruoyi/server/logs/
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"
@@ -130,14 +117,12 @@
environment:
# 鏃跺尯涓婃捣
TZ: Asia/Shanghai
+ SERVER_PORT: 8081
volumes:
# 閰嶇疆鏂囦欢
- /docker/server2/logs/:/ruoyi/server/logs/
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
@@ -149,10 +134,7 @@
# 閰嶇疆鏂囦欢
- /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
@@ -164,14 +146,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"
diff --git a/script/docker/nginx/nginx.conf b/script/docker/nginx/nginx.conf
index ecf7195..e9630aa 100644
--- a/script/docker/nginx/nginx.conf
+++ b/script/docker/nginx/nginx.conf
@@ -23,16 +23,16 @@
upstream server {
ip_hash;
- server 172.30.0.60:8080;
- server 172.30.0.61:8080;
+ server 127.0.0.1:8080;
+ server 127.0.0.1:8081;
}
upstream monitor-admin {
- server 172.30.0.90:9090;
+ server 127.0.0.1:9090;
}
upstream xxljob-admin {
- server 172.30.0.92:9100;
+ server 127.0.0.1:9100;
}
server {
--
Gitblit v1.9.3