docker img version

apache · Dec 1, 2021 · 0a58971 · 0a58971
1 parent 00352bb
commit 0a58971
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/ci/linux-ci-init-service.sh b/ci/linux-ci-init-service.sh
@@ -25,3 +25,6 @@ docker pull openwhisk/action-nodejs-v14:nightly
 docker run --rm -d --name openwhisk -p 3233:3233 -p 3232:3232 -v /var/run/docker.sock:/var/run/docker.sock openwhisk/standalone:nightly
 docker exec -i openwhisk waitready
 docker exec -i openwhisk bash -c "wsk action update test <(echo 'function main(args){return {\"hello\":args.name || \"test\"}}') --kind nodejs:14"
+
+docker exec -i rmqnamesrv rm /home/rocketmq/rocketmq-4.6.0/conf/tools.yml
+docker exec -i rmqnamesrv /home/rocketmq/rocketmq-4.6.0/bin/mqadmin updateTopic -n namesrv:9876 -t test -c DefaultCluster
diff --git a/ci/pod/docker-compose.yml b/ci/pod/docker-compose.yml
@@ -355,25 +355,27 @@ services:
     networks:
       apisix_net:
 
-  rocketmq_namesrv:
-    image: apacherocketmq/rocketmq:4.9.1
+  namesrv:
+    image: apacherocketmq/rocketmq:4.6.0
     container_name: rmqnamesrv
     restart: unless-stopped
     ports:
       - "9876:9876"
+    command: sh mqnamesrv
     networks:
       rocketmq_net:
 
-  rocketmq_broker:
-    image: apacherocketmq/rocketmq:4.9.1
+  broker:
+    image: apacherocketmq/rocketmq:4.6.0
     container_name: rmqbroker
     restart: unless-stopped
     ports:
       - "10909:10909"
       - "10911:10911"
       - "10912:10912"
     depends_on:
-      - rocketmq_namesrv
+      - namesrv
+    command: sh mqbroker -n namesrv:9876 -c ../conf/broker.conf
     networks:
       rocketmq_net:
 

diff --git a/docs/zh/latest/plugins/rocketmq-logger.md b/docs/zh/latest/plugins/rocketmq-logger.md
@@ -32,7 +32,7 @@ title: rocketmq-logger
 
 ## 简介
 
-`rocketmq-logger` 插件利用ngx_lua客户端能力，可推送JSON格式的日志到外部rocketmq集群。
+`rocketmq-logger` 插件利用ngx_lua客户端能力，可推送JSON格式的请求日志到外部rocketmq集群。
 
 它可以将接口请求日志以 JSON 的形式推送给外部 rocketmq 集群。如果在短时间内没有收到日志数据，请放心，它会在我们的批处理处理器中的计时器功能到期后自动发送日志。
 

diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
@@ -72,7 +72,7 @@ dependencies = {
     "api7-snowflake = 2.0-1",
     "inspect == 3.1.1",
     "lualdap = 1.2.6-1",
-    "lua-resty-rocketmq = 0.2.1-0",
+    "lua-resty-rocketmq = 0.2.1-1",
 }
 
 build = {