This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 77508aa fix(docker-compose): fix inconsistent broker.conf
new a1af23e Merge pull request #20 from liuruiyiyang/fix_docker_compose
77508aa is described below
commit 77508aaca813384df6b42954d42f538039c765ea
Author: liuruiyiyang <[email protected]>
AuthorDate: Mon Jan 6 19:10:43 2020 +0800
fix(docker-compose): fix inconsistent broker.conf
---
README.md | 1 +
templates/docker-compose/docker-compose.yml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index e6b242d..c72a1b2 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ Users can generate a runtime (stage) directory based on a
specific version and d
sh stage.sh RMQ-VERSION
```
+> Note: RMQ-VERSION is the tag of the RocketMQ image.
After executing the above shell script, (e.g. sh stage.sh 4.5.0), it will
generate a stage directory (./stages/4.5.0). User can do the following works
under the directory, assuming the RMQ-version is defined with 4.5.0.
#### 1. Single Node
diff --git a/templates/docker-compose/docker-compose.yml
b/templates/docker-compose/docker-compose.yml
index 6534e0d..ca39d02 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -26,7 +26,7 @@ services:
- ./data/broker/logs:/home/rocketmq/logs
- ./data/broker/store:/home/rocketmq/store
-
./data/broker/conf/broker.conf:/opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
- command: sh mqbroker -c ../conf/broker.conf
+ command: sh mqbroker -c /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
#Service for another broker -- broker1
broker1:
@@ -44,4 +44,4 @@ services:
- ./data1/broker/logs:/home/rocketmq/logs
- ./data1/broker/store:/home/rocketmq/store
-
./data1/broker/conf/broker.conf:/opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
- command: sh mqbroker -c ../conf/broker.conf
+ command: sh mqbroker -c /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf
