Merge pull request #2112 from Websoft9/fix/rocketmq

feat: update rocketmq compose configuration

Author: zhaojing1987

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
 #### --------------------------------------------------------------------------------------- ####

apps/rocketmq/Notes.md

@@ -1 +0,0 @@
-## RocketMQ

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:

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`

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

i18n/translation.json

@@ -438,5 +438,9 @@
     "W9_SMTP_PORT_SET": [
         "SMTP PORT",
         "SMTP 端口"
+    ],
+    "W9_BRIDGE_PORT_SET": [
+        "",
+        ""
     ]
 }