From c315c4127088a1e14d78ce3d781c748ab30f883c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 9 Dec 2025 16:47:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20kafka=20docker=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20=E4=BD=BF=E7=94=A8apache=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=203.6.2=20=3D>=203.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/docker/docker-compose.yml | 59 +++++++++-----------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 0f72a6cf0..3b6d835bb 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -395,56 +395,31 @@ services:
       - /docker/rabbitmq/data:/var/lib/rabbitmq
     network_mode: "host"
 
-  zookeeper:
-    image: 'bitnami/zookeeper:3.8.0'
-    container_name: zookeeper
-    ports:
-      - "2181:2181"
-    environment:
-      TZ: Asia/Shanghai
-      ALLOW_ANONYMOUS_LOGIN: "yes"
-      ZOO_SERVER_ID: 1
-      ZOO_PORT_NUMBER: 2181
-      # 自带的控制台 一般用不上可自行开启
-      ZOO_ENABLE_ADMIN_SERVER: "no"
-      # 自带控制台的端口
-      ZOO_ADMIN_SERVER_PORT_NUMBER: 8080
-    network_mode: "host"
-
   kafka:
-    image: 'bitnami/kafka:3.6.2'
+    image: apache/kafka:3.9.1
     container_name: kafka
     ports:
       - "9092:9092"
+      - "9093:9093"
     environment:
-      TZ: Asia/Shanghai
-      # 更多变量 查看文档 https://github.com/bitnami/bitnami-docker-kafka/blob/master/README.md
-      KAFKA_BROKER_ID: 1
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
       # 监听端口
-      KAFKA_CFG_LISTENERS: PLAINTEXT://:9092
+      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:9093
       # 实际访问ip 本地用 127 内网用 192 外网用 外网ip
-      KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://192.168.31.165:9092
-      KAFKA_CFG_ZOOKEEPER_CONNECT: 127.0.0.1:2181
-      ALLOW_PLAINTEXT_LISTENER: "yes"
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://192.168.31.165:9092
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_LOG_DIRS: /var/lib/kafka/data
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_LOG_RETENTION_HOURS: 168
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      CLUSTER_ID: "Mk3OEYBSD34fcwNTJENDM2Qk" # 使用 kafka-storage.sh random-uuid 生成
     volumes:
-      - /docker/kafka/data:/bitnami/kafka/data
-    depends_on:
-      - zookeeper
-    network_mode: "host"
-
-  kafka-manager:
-    image: sheepkiller/kafka-manager:latest
-    container_name: kafka-manager
-    ports:
-      - "19092:19092"
-    environment:
-      ZK_HOSTS: 127.0.0.1:2181
-      APPLICATION_SECRET: letmein
-      KAFKA_MANAGER_USERNAME: ruoyi
-      KAFKA_MANAGER_PASSWORD: ruoyi123
-      KM_ARGS: -Dhttp.port=19092
-    depends_on:
-      - kafka
+      - /docker/kafka/data:/var/lib/kafka/data
     network_mode: "host"
 
   sky-oap: