From 20adb0892677cbeb21a85a45d5be95d6a1f1d10b Mon Sep 17 00:00:00 2001
From: whs <1539286867@qq.com>
Date: Tue, 9 Dec 2025 14:25:35 +0800
Subject: [PATCH] Changes

---
 Jenkins/docker-compose.yml                       |  6 ++++++
 Jenkins/image/Dockerfile                         |  1 +
 .../tools/apache-maven-3.9.0/conf/settings.xml   |  5 +++++
 gitea/docker-compose.yml                         |  5 +++++
 mysql/docker-compose.yml                         |  7 ++++++-
 nexus/docker-compose.yml                         | 10 ++++++++--
 redis/docker-compose.yml                         |  8 +++++++-
 rocketmq/brokerconf/broker.conf                  |  8 ++++----
 rocketmq/docker-compose.yml                      | 16 +++++++++++++---
 test/Dockerfile                                  | 14 ++++++++++++++
 test/docker-compose.yml                          | 16 ++++++++++++++++
 zookeeper/docker-compose.yml                     |  5 +++++
 12 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 test/Dockerfile
 create mode 100644 test/docker-compose.yml

diff --git a/Jenkins/docker-compose.yml b/Jenkins/docker-compose.yml
index 38d3bdf..59038b5 100644
--- a/Jenkins/docker-compose.yml
+++ b/Jenkins/docker-compose.yml
@@ -13,6 +13,12 @@ services:
       - /usr/bin/docker:/usr/bin/docker
     ports:
       - 2023:8080
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 volumes:
   jenkins_home:
+    driver: local
diff --git a/Jenkins/image/Dockerfile b/Jenkins/image/Dockerfile
index 2f38514..c43620a 100644
--- a/Jenkins/image/Dockerfile
+++ b/Jenkins/image/Dockerfile
@@ -1,4 +1,5 @@
 FROM jenkins/jenkins:2.375.3-lts-jdk11
+#FROM jenkins:latest
 
 USER root
 
diff --git a/Jenkins/image/tools/apache-maven-3.9.0/conf/settings.xml b/Jenkins/image/tools/apache-maven-3.9.0/conf/settings.xml
index 62cba0a..e08a59c 100644
--- a/Jenkins/image/tools/apache-maven-3.9.0/conf/settings.xml
+++ b/Jenkins/image/tools/apache-maven-3.9.0/conf/settings.xml
@@ -133,6 +133,11 @@ under the License.
       <passphrase>optional; leave empty if not used.</passphrase>
     </server>
     -->
+  <server>
+    <id>kanglai</id>
+    <username>67adf730f7368ab7428c0fcb</username>
+    <password>j_oO=[56Sb=)</password>
+  </server>
   </servers>
 
   <!-- mirrors
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index e544c5d..15d7ea0 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -26,6 +26,11 @@ services:
     ports:
       - 8066:3000
       - 8065:22
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 # 配置卷
 volumes:
diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
index 106ad33..a04cab1 100644
--- a/mysql/docker-compose.yml
+++ b/mysql/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     hostname: mysql
     environment:
       TZ: Asia/Shanghai
-      MYSQL_ROOT_PASSWORD: kanglai@2022
+      MYSQL_ROOT_PASSWORD: kanglai@2024
     command:
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
@@ -22,6 +22,11 @@ services:
     restart: always
     ports:
       - 8052:3306
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 # 配置卷
 volumes:
diff --git a/nexus/docker-compose.yml b/nexus/docker-compose.yml
index 35a3c0a..8e0953d 100644
--- a/nexus/docker-compose.yml
+++ b/nexus/docker-compose.yml
@@ -15,7 +15,13 @@ services:
     ports:
       - 7779:8081
     volumes:
-      - nexus-data:/nexus-data
+      - /usr/software/dockerDatabase/nexus/nexus-data:/nexus-data
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 volumes:
-  nexus-data: {}
+  nexus-data:
+    driver: local
diff --git a/redis/docker-compose.yml b/redis/docker-compose.yml
index 7bae44b..a50b2bd 100644
--- a/redis/docker-compose.yml
+++ b/redis/docker-compose.yml
@@ -1,8 +1,9 @@
 # PROJECT: 康来生物有限公司kicc(智慧冷链)分布式架构平台
 # VERSION: 1.0.0
 # Author: 康来生物科技有限公司-王翔
-
 # https://support.websoft9.com/docs/docker/zh/solution-compose.html#command
+# 初次启动redis，会有一个警告this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf
+# 解决办法：vim /etc/sysctl.conf  在sysctl.conf中加入vm.overcommit_memory = 1  ， sysctl -p查看是否设置成功
 version: '3'
 services:
 
@@ -18,6 +19,11 @@ services:
     volumes:
       - redis:/data
       - /usr/software/dockerDatabase/redis/redis.conf:/usr/local/etc/redis/redis.conf
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 # 配置卷
 volumes:
diff --git a/rocketmq/brokerconf/broker.conf b/rocketmq/brokerconf/broker.conf
index 9ba6283..51934f4 100644
--- a/rocketmq/brokerconf/broker.conf
+++ b/rocketmq/brokerconf/broker.conf
@@ -47,10 +47,10 @@ listenPort=10911
 deleteWhen=04
 
 # 文件保留时间，默认48小时
-fileReservedTime=120
+fileReservedTime=72
 
 # commitLog 每个文件的大小默认1G
-mapedFileSizeCommitLog=1073741824
+mapedFileSizeCommitLog=1024 * 1024 * 1024
 
 # ConsumeQueue 每个文件默认存 30W 条，根据业务情况调整
 mapedFileSizeConsumeQueue=300000
@@ -58,7 +58,7 @@ mapedFileSizeConsumeQueue=300000
 # destroyMapedFileIntervalForcibly=120000
 # redeleteHangedFileInterval=120000
 # 检测物理文件磁盘空间
-diskMaxUsedSpaceRatio=88
+diskMaxUsedSpaceRatio=75
 # 存储路径
 # storePathRootDir=/home/ztztdata/rocketmq-all-4.1.0-incubating/store
 # commitLog 存储路径
@@ -71,7 +71,7 @@ diskMaxUsedSpaceRatio=88
 # storeCheckpoint=/home/ztztdata/rocketmq-all-4.1.0-incubating/store/checkpoint
 # abort 文件存储路径
 # abortFile=/home/ztztdata/rocketmq-all-4.1.0-incubating/store/abort
-# 限制的消息大小
+# 限制的消息大小64k
 maxMessageSize=65536
 
 # flushCommitLogLeastPages=4
diff --git a/rocketmq/docker-compose.yml b/rocketmq/docker-compose.yml
index 3327c2e..e9c648b 100644
--- a/rocketmq/docker-compose.yml
+++ b/rocketmq/docker-compose.yml
@@ -20,6 +20,11 @@ services:
       rmq:
         aliases:
           - rmqnamesrv
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
   # rocketmq核心消息发送存储代理
   rmqbroker:
@@ -30,13 +35,13 @@ services:
       - 10909:10909
       - 10911:10911
     volumes:
-      - /usr/software/dockerDatabase/rocketmq/namesrv/logs:/opt/logs
-      - /usr/software/dockerDatabase/rocketmq/namesrv/store:/opt/store
+      - /usr/software/dockerDatabase/rocketmq/broker/logs:/opt/logs
+      - /usr/software/dockerDatabase/rocketmq/broker/store:/opt/store
       - /usr/software/dockerDatabase/rocketmq/broker/brokerconf/broker.conf:/etc/rocketmq/broker.conf
     environment:
       NAMESRV_ADDR: "rmqnamesrv:9876"
       JAVA_OPTS: "-Duser.home=/opt"
-      JAVA_OPT_EXT: "-server -Xms128m -Xmx128m -Xmn128m"
+      JAVA_OPT_EXT: "-server -Xms1280m -Xmx1280m -Xmn1280m"
     command: mqbroker -c /etc/rocketmq/broker.conf
     depends_on:
       - rmqnamesrv
@@ -44,6 +49,11 @@ services:
       rmq:
         aliases:
           - rmqbroker
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"
 
 # 局域网网关配置
 networks:
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
index 0000000..e61879d
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,14 @@
+FROM centos:7
+
+USER root
+
+WORKDIR /home
+
+RUN docker pause a6fda06c5c68
+
+RUN docker commit a6fda06c5c68 redis:kanglai
+
+#RUN docker commit a6fda06c5c68 jenkins:kanglai
+
+
+
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
new file mode 100644
index 0000000..82a373e
--- /dev/null
+++ b/test/docker-compose.yml
@@ -0,0 +1,16 @@
+version: "3"
+services:
+  jenkins:
+    image: jenkins
+    container_name: jenkins
+    hostname: jenkins
+    restart: always
+    volumes:
+      - jenkins_home:/var/jenkins_home
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /usr/bin/docker:/usr/bin/docker
+    ports:
+      - 2023:8080
+
+volumes:
+  jenkins_home:
diff --git a/zookeeper/docker-compose.yml b/zookeeper/docker-compose.yml
index fbd5723..a0a8746 100644
--- a/zookeeper/docker-compose.yml
+++ b/zookeeper/docker-compose.yml
@@ -17,3 +17,8 @@ services:
       - /usr/software/dockerDatabase/zookeeper/logs:/datalog
     ports:
       - 2181:2181
+    logging:
+      driver: json-file
+      options:
+        max-size: "50m"
+        max-file: "10"