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
commit c40ccce9050d2a9e794eeaaa055307195061fca7 Merge: 4bf0d04 bd1d731 Author: von gosling <[email protected]> AuthorDate: Fri Nov 8 16:34:51 2019 +0800 Merge branch 'master' into master README.md | 10 +++++----- image-build/build-image.sh | 4 ++-- image-build/update.sh | 2 +- product/start-broker.sh | 2 +- product/start-ns.sh | 2 +- templates/docker-compose/docker-compose.yml | 6 +++--- templates/kubernetes/deployment.yaml | 4 ++-- templates/kubernetes/deployment2.yaml | 4 ++-- templates/play-docker-deledger.sh | 8 ++++---- templates/play-docker-tls.sh | 4 ++-- templates/play-docker.sh | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --cc README.md index 11f38fe,a02ba20..9bb3070 --- a/README.md +++ b/README.md @@@ -181,8 -181,8 +181,8 @@@ And put the customized `broker.conf` fi Then we can modify the `play-docker.sh` and volume this file to the broker container when it starts. For example: ``` - docker run -d -p 10911:10911 -p 10909:10909 -v `pwd`/data/broker/logs:/root/logs -v `pwd`/data/broker/store:/root/store -v `pwd`/data/broker/conf/broker.conf:/opt/rocketmq-4.4.0/conf/broker.conf --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" rocketmqinc/rocketmq:4.4 + docker run -d -p 10911:10911 -p 10909:10909 -v `pwd`/data/broker/logs:/root/logs -v `pwd`/data/broker/store:/root/store -v `pwd`/data/broker/conf/broker.conf:/opt/rocketmq-4.4.0/conf/broker.conf --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:4.4 -.0 sh mqbroker -c /opt/rocketmq-4.4.0/conf/broker.conf +.0 sh mqbroker -c /home/rocketmq/rocketmq-4.4.0/conf/broker.conf ``` @@@ -190,8 -190,8 +190,8 @@@ Finally we can find the customized `bro ``` huandeMacBook-Pro:4.4.0 huan$ docker ps |grep mqbroker - a32c67aed6dd rocketmqinc/rocketmq:4.4.0 "sh mqbroker" 20 minutes ago Up 20 minutes 0.0.0.0:10909->10909/tcp, 9876/tcp, 0.0.0.0:10911->10911/tcp rmqbroker + a32c67aed6dd apacherocketmq/rocketmq:4.4.0 "sh mqbroker" 20 minutes ago Up 20 minutes 0.0.0.0:10909->10909/tcp, 9876/tcp, 0.0.0.0:10911->10911/tcp rmqbroker -huandeMacBook-Pro:4.4.0 huan$ docker exec -it a32c67aed6dd cat /opt/rocketmq-4.4.0/conf/broker.conf +huandeMacBook-Pro:4.4.0 huan$ docker exec -it a32c67aed6dd cat /home/rocketmq/rocketmq-4.4.0/conf/broker.conf brokerClusterName = DefaultCluster brokerName = broker-a brokerId = 0
