From a63d02a32fb05c2634b0ba134f47ff3347ecc55d Mon Sep 17 00:00:00 2001 From: zhaojing1987 Date: Wed, 27 May 2026 14:10:27 +0800 Subject: [PATCH] feat: update rocketmq compose configuration --- apps/rocketmq/.env | 6 ++++++ apps/rocketmq/Notes.md | 1 - apps/rocketmq/docker-compose.yml | 31 ++++++++++++++++++++++++------- apps/rocketmq/src/README.md | 2 ++ apps/rocketmq/src/broker.conf | 10 ++++++++++ i18n/translation.json | 4 ++++ 6 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 apps/rocketmq/src/broker.conf diff --git a/apps/rocketmq/.env b/apps/rocketmq/.env index a7b211997..92f91d395 100644 --- a/apps/rocketmq/.env +++ b/apps/rocketmq/.env @@ -1,10 +1,16 @@ W9_VERSION='5.3.1' +W9_DASHBOARD_VERSION='2.1.0' W9_DIST='community' W9_REPO=apache/rocketmq #### -- Not allowed to edit below environments when recreate app based on existing data -- #### W9_ID='rocketmq' +W9_NAMESRV_PORT_SET='9876' +W9_BROKER_VIP_PORT_SET='10909' +W9_BROKER_PORT_SET='10911' +W9_BROKER_HA_PORT_SET='10912' W9_PROXY_REMOTING_PORT_SET='8080' W9_PROXY_GRPC_PORT_SET='8081' +W9_DASHBOARD_PORT_SET='8090' W9_NETWORK=websoft9 #### --------------------------------------------------------------------------------------- #### diff --git a/apps/rocketmq/Notes.md b/apps/rocketmq/Notes.md index a9b03ff74..e69de29bb 100644 --- a/apps/rocketmq/Notes.md +++ b/apps/rocketmq/Notes.md @@ -1 +0,0 @@ -## RocketMQ diff --git a/apps/rocketmq/docker-compose.yml b/apps/rocketmq/docker-compose.yml index f802ff3e7..d76746f92 100644 --- a/apps/rocketmq/docker-compose.yml +++ b/apps/rocketmq/docker-compose.yml @@ -8,23 +8,26 @@ services: image: ${W9_REPO}:${W9_VERSION} container_name: ${W9_ID}-nameserver restart: unless-stopped - # ports: - # - 9876:9876 + ports: + - ${W9_NAMESRV_PORT_SET}:9876 command: sh mqnamesrv broker: image: ${W9_REPO}:${W9_VERSION} container_name: ${W9_ID}-broker restart: unless-stopped - # ports: - # - 10909:10909 - # - 10911:10911 - # - 10912:10912 + ports: + - ${W9_BROKER_VIP_PORT_SET}:10909 + - ${W9_BROKER_PORT_SET}:10911 + - ${W9_BROKER_HA_PORT_SET}:10912 environment: - NAMESRV_ADDR=${W9_ID}-nameserver:9876 + volumes: + - rocketmq_home:/home/rocketmq + - ./src/broker.conf:/home/rocketmq/rocketmq-${W9_VERSION}/conf/broker.conf depends_on: - namesrv - command: sh mqbroker + command: sh mqbroker -c /home/rocketmq/rocketmq-${W9_VERSION}/conf/broker.conf proxy: image: ${W9_REPO}:${W9_VERSION} @@ -40,6 +43,20 @@ services: environment: - NAMESRV_ADDR=${W9_ID}-nameserver:9876 command: sh mqproxy + + dashboard: + image: apacherocketmq/rocketmq-dashboard:${W9_DASHBOARD_VERSION} + container_name: ${W9_ID}-dashboard + depends_on: + - namesrv + ports: + - ${W9_DASHBOARD_PORT_SET}:8082 + restart: unless-stopped + environment: + - JAVA_OPTS=-Drocketmq.namesrv.addr=${W9_ID}-nameserver:9876 + +volumes: + rocketmq_home: networks: default: diff --git a/apps/rocketmq/src/README.md b/apps/rocketmq/src/README.md index cdbd7a0b9..2068d7621 100644 --- a/apps/rocketmq/src/README.md +++ b/apps/rocketmq/src/README.md @@ -1,3 +1,5 @@ # About This folder includes files mount to container and used by Websoft9 + +- `broker.conf`: RocketMQ broker config mounted to `/home/rocketmq/rocketmq-${W9_VERSION}/conf/broker.conf` diff --git a/apps/rocketmq/src/broker.conf b/apps/rocketmq/src/broker.conf new file mode 100644 index 000000000..668822bc2 --- /dev/null +++ b/apps/rocketmq/src/broker.conf @@ -0,0 +1,10 @@ +brokerClusterName=DefaultCluster +brokerName=broker-a +brokerId=0 +deleteWhen=04 +fileReservedTime=48 +brokerRole=ASYNC_MASTER +flushDiskType=ASYNC_FLUSH + +# Replace with the actual host/public IP when not running a local quickstart. +#brokerIP1=127.0.0.1 \ No newline at end of file diff --git a/i18n/translation.json b/i18n/translation.json index 6472eb951..45810e8d7 100644 --- a/i18n/translation.json +++ b/i18n/translation.json @@ -438,5 +438,9 @@ "W9_SMTP_PORT_SET": [ "SMTP PORT", "SMTP 端口" + ], + "W9_BRIDGE_PORT_SET": [ + "", + "" ] } \ No newline at end of file