diff --git a/README.md b/README.md index d682133..9b7cb74 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotn | [`deploy/zookeeper-3.8.4-cluster`](deploy/zookeeper-3.8.4-cluster/README.md) | Zookeeper 3.8.4 ×3 | 2181-2183 | 三节点集群 | | [`deploy/zookeeper-3.9.3-standalone`](deploy/zookeeper-3.9.3-standalone/README.md) | Zookeeper 3.9.3 | 2181 | 单机 | | [`deploy/zookeeper-3.9.3-cluster`](deploy/zookeeper-3.9.3-cluster/README.md) | Zookeeper 3.9.3 ×3 | 2181-2183 | 三节点集群 | -| [`deploy/rocketmq-4.9.6-standalone`](deploy/rocketmq-4.9.6-standalone/README.md) | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Namesrv + 单 Broker | -| [`deploy/rocketmq-4.9.6-cluster-1m2s`](deploy/rocketmq-4.9.6-cluster-1m2s/README.md) | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Master + 双 Slave | -| [`deploy/rocketmq-4.9.6-cluster-2m`](deploy/rocketmq-4.9.6-cluster-2m/README.md) | RocketMQ 4.9.6 | 9876、10709-10712 | 双 Master(无 Slave) | +| [`deploy/rocketmq-4.9.6-standalone`](deploy/rocketmq-4.9.7-standalone/README.md) | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Namesrv + 单 Broker | +| [`deploy/rocketmq-4.9.6-cluster-1m2s`](deploy/rocketmq-4.9.7-cluster-1m2s/README.md) | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Master + 双 Slave | +| [`deploy/rocketmq-4.9.6-cluster-2m`](deploy/rocketmq-4.9.7-cluster-2m/README.md) | RocketMQ 4.9.6 | 9876、10709-10712 | 双 Master(无 Slave) | | [`deploy/efk`](deploy/efk/README.md) | Elasticsearch / Kibana / Filebeat 7.14.1 | 9200、9300、5601 | 日志采集 + 搜索 + 展示,含 ik 分词 | | [`deploy/skywalking-9.5.0-es`](deploy/skywalking-9.5.0-es/README.md) | SkyWalking OAP / UI 9.5.0 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | | [`deploy/skywalking-9.5.0-mysql`](deploy/skywalking-9.5.0-mysql/README.md) | SkyWalking OAP / UI 9.5.0 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/README.md b/deploy/rocketmq-4.9.7-cluster-1m2s/README.md similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/README.md rename to deploy/rocketmq-4.9.7-cluster-1m2s/README.md diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf b/deploy/rocketmq-4.9.7-cluster-1m2s/broker-master/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf rename to deploy/rocketmq-4.9.7-cluster-1m2s/broker-master/broker.conf diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf b/deploy/rocketmq-4.9.7-cluster-1m2s/broker-slave1/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf rename to deploy/rocketmq-4.9.7-cluster-1m2s/broker-slave1/broker.conf diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf b/deploy/rocketmq-4.9.7-cluster-1m2s/broker-slave2/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf rename to deploy/rocketmq-4.9.7-cluster-1m2s/broker-slave2/broker.conf diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/demo.png b/deploy/rocketmq-4.9.7-cluster-1m2s/demo.png similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/demo.png rename to deploy/rocketmq-4.9.7-cluster-1m2s/demo.png diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml b/deploy/rocketmq-4.9.7-cluster-1m2s/docker-compose.yml similarity index 86% rename from deploy/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml rename to deploy/rocketmq-4.9.7-cluster-1m2s/docker-compose.yml index 5f93c48..363a18e 100644 --- a/deploy/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml +++ b/deploy/rocketmq-4.9.7-cluster-1m2s/docker-compose.yml @@ -10,7 +10,7 @@ networks: services: namesrv: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqnamesrv ports: - "9876:9876" @@ -19,7 +19,7 @@ services: ipv4_address: 172.20.0.80 command: sh mqnamesrv broker1: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker1 ports: - "10909:10909" @@ -36,7 +36,7 @@ services: ipv4_address: 172.20.0.81 command: sh mqbroker -c /home/rocketmq/rocketmq-4.9.6/conf/broker.conf broker2: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker2 ports: - "10809:10909" @@ -53,7 +53,7 @@ services: ipv4_address: 172.20.0.82 command: sh mqbroker -c /home/rocketmq/rocketmq-4.9.6/conf/broker.conf broker3: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker3 ports: - "10709:10909" diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/shutdown.sh b/deploy/rocketmq-4.9.7-cluster-1m2s/shutdown.sh similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/shutdown.sh rename to deploy/rocketmq-4.9.7-cluster-1m2s/shutdown.sh diff --git a/deploy/rocketmq-4.9.6-cluster-1m2s/startup.sh b/deploy/rocketmq-4.9.7-cluster-1m2s/startup.sh similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-1m2s/startup.sh rename to deploy/rocketmq-4.9.7-cluster-1m2s/startup.sh diff --git a/deploy/rocketmq-4.9.6-cluster-2m/README.md b/deploy/rocketmq-4.9.7-cluster-2m/README.md similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/README.md rename to deploy/rocketmq-4.9.7-cluster-2m/README.md diff --git a/deploy/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf b/deploy/rocketmq-4.9.7-cluster-2m/broker-master1/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf rename to deploy/rocketmq-4.9.7-cluster-2m/broker-master1/broker.conf diff --git a/deploy/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf b/deploy/rocketmq-4.9.7-cluster-2m/broker-master2/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf rename to deploy/rocketmq-4.9.7-cluster-2m/broker-master2/broker.conf diff --git a/deploy/rocketmq-4.9.6-cluster-2m/demo.png b/deploy/rocketmq-4.9.7-cluster-2m/demo.png similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/demo.png rename to deploy/rocketmq-4.9.7-cluster-2m/demo.png diff --git a/deploy/rocketmq-4.9.6-cluster-2m/docker-compose.yml b/deploy/rocketmq-4.9.7-cluster-2m/docker-compose.yml similarity index 86% rename from deploy/rocketmq-4.9.6-cluster-2m/docker-compose.yml rename to deploy/rocketmq-4.9.7-cluster-2m/docker-compose.yml index 1b67c65..e842a62 100644 --- a/deploy/rocketmq-4.9.6-cluster-2m/docker-compose.yml +++ b/deploy/rocketmq-4.9.7-cluster-2m/docker-compose.yml @@ -10,7 +10,7 @@ networks: services: namesrv: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqnamesrv ports: - "9876:9876" @@ -19,7 +19,7 @@ services: ipv4_address: 172.20.0.80 command: sh mqnamesrv broker1: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker1 ports: - "10909:10909" @@ -36,7 +36,7 @@ services: ipv4_address: 172.20.0.81 command: sh mqbroker -c /home/rocketmq/rocketmq-4.9.6/conf/broker.conf broker2: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker2 ports: - "10809:10909" diff --git a/deploy/rocketmq-4.9.6-cluster-2m/shutdown.sh b/deploy/rocketmq-4.9.7-cluster-2m/shutdown.sh similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/shutdown.sh rename to deploy/rocketmq-4.9.7-cluster-2m/shutdown.sh diff --git a/deploy/rocketmq-4.9.6-cluster-2m/startup.sh b/deploy/rocketmq-4.9.7-cluster-2m/startup.sh similarity index 100% rename from deploy/rocketmq-4.9.6-cluster-2m/startup.sh rename to deploy/rocketmq-4.9.7-cluster-2m/startup.sh diff --git a/deploy/rocketmq-4.9.6-standalone/README.md b/deploy/rocketmq-4.9.7-standalone/README.md similarity index 100% rename from deploy/rocketmq-4.9.6-standalone/README.md rename to deploy/rocketmq-4.9.7-standalone/README.md diff --git a/deploy/rocketmq-4.9.6-standalone/demo.png b/deploy/rocketmq-4.9.7-standalone/demo.png similarity index 100% rename from deploy/rocketmq-4.9.6-standalone/demo.png rename to deploy/rocketmq-4.9.7-standalone/demo.png diff --git a/deploy/rocketmq-4.9.6-standalone/docker-compose.yml b/deploy/rocketmq-4.9.7-standalone/docker-compose.yml similarity index 87% rename from deploy/rocketmq-4.9.6-standalone/docker-compose.yml rename to deploy/rocketmq-4.9.7-standalone/docker-compose.yml index 43d0078..aeeebf6 100644 --- a/deploy/rocketmq-4.9.6-standalone/docker-compose.yml +++ b/deploy/rocketmq-4.9.7-standalone/docker-compose.yml @@ -10,7 +10,7 @@ networks: services: namesrv: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqnamesrv ports: - "9876:9876" @@ -19,7 +19,7 @@ services: ipv4_address: 172.20.0.80 command: sh mqnamesrv broker: - image: registry.cn-shanghai.aliyuncs.com/odboy/apache-rocketmq:4.9.6 + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-rocketmq-4.9.7 container_name: rmqbroker ports: - "10909:10909" diff --git a/deploy/rocketmq-4.9.6-standalone/master/broker.conf b/deploy/rocketmq-4.9.7-standalone/master/broker.conf similarity index 100% rename from deploy/rocketmq-4.9.6-standalone/master/broker.conf rename to deploy/rocketmq-4.9.7-standalone/master/broker.conf diff --git a/deploy/rocketmq-4.9.6-standalone/shutdown.sh b/deploy/rocketmq-4.9.7-standalone/shutdown.sh similarity index 100% rename from deploy/rocketmq-4.9.6-standalone/shutdown.sh rename to deploy/rocketmq-4.9.7-standalone/shutdown.sh diff --git a/deploy/rocketmq-4.9.6-standalone/startup.sh b/deploy/rocketmq-4.9.7-standalone/startup.sh similarity index 100% rename from deploy/rocketmq-4.9.6-standalone/startup.sh rename to deploy/rocketmq-4.9.7-standalone/startup.sh