Merge pull request #2114 from Websoft9/dev

Fix rocketmq

Author: zhaojing1987

apps/rocketmq/.env

@@ -1,13 +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_HTTP_PORT=8080
-W9_HTTP_PORT_SET='8080'
-#W9_DASHBOARD_PORT_SET=8090
-W9_BROKER_PORT_SET='10909'
+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
-W9_URL='appname.example.com'
 #### --------------------------------------------------------------------------------------- ####

apps/rocketmq/Notes.md

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

apps/rocketmq/docker-compose.yml

@@ -8,46 +8,54 @@ 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:
-      - ${W9_BROKER_PORT_SET}:10909
-      # - 10911:10911
-      # - 10912:10912
+      - ${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
     depends_on:
       - namesrv
     command: sh mqbroker
+
   proxy:
-    image: apache/rocketmq:5.2.0
+    image: ${W9_REPO}:${W9_VERSION}
     container_name: ${W9_ID}
     env_file: .env
     depends_on:
       - broker
       - namesrv
     ports:
-      - ${W9_HTTP_PORT_SET}:8080
-      # - 8081:8081
+      - ${W9_PROXY_REMOTING_PORT_SET}:8080
+      - ${W9_PROXY_GRPC_PORT_SET}:8081
     restart: unless-stopped
     environment:
       - NAMESRV_ADDR=${W9_ID}-nameserver:9876
     command: sh mqproxy
-  # dashboard:
-  #   image: apacherocketmq/rocketmq-dashboard:latest
-  #   container_name: ${W9_ID}-dashboard
-  #   depends_on:
-  #     - namesrv
-  #   ports:
-  #     - ${W9_DASHBOARD_PORT_SET}:8080
-  #   restart: unless-stopped
-  #   environment:
-  #     - JAVA_OPTS=-Drocketmq.namesrv.addr=${W9_ID}-rmqnamesrv:9876
+
+  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/variables.json

@@ -8,6 +8,7 @@
     {
       "dist": "community",
       "version": [
+        "5.3.2",
         "5.3.1",
         "latest"
       ]
@@ -19,4 +20,4 @@
     "disk": "1",
     "url": "https://rocketmq.apache.org/docs/"
   }
-}
+}

i18n/translation.json

@@ -363,6 +363,14 @@
         "PROXY PORT",
         "代理端口"
     ],
+    "W9_PROXY_REMOTING_PORT_SET": [
+        "RocketMQ Proxy Remoting Port",
+        "RocketMQ Proxy Remoting 端口"
+    ],
+    "W9_PROXY_GRPC_PORT_SET": [
+        "RocketMQ Proxy gRPC Port",
+        "RocketMQ Proxy gRPC 端口"
+    ],
     "W9_LOGIN_ConnectURL": [
         "LOGIN OONNECT URL",
         "登陆连接地址"
@@ -430,5 +438,9 @@
     "W9_SMTP_PORT_SET": [
         "SMTP PORT",
         "SMTP 端口"
+    ],
+    "W9_BRIDGE_PORT_SET": [
+        "",
+        ""
     ]
 }