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 bd1d73177510f514da2c36c18aec80722b88675b Author: vongosling <[email protected]> AuthorDate: Fri Nov 8 15:59:04 2019 +0800 fix(image): commit omitted changes --- README.md | 10 +++++----- 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 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e44fedb..a02ba20 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ cd image-build ./update.sh ``` -This script will get the latest release version of RocketMQ and build the docker images based on ```alpine``` and ```centos``` respectively, then push the new images to the current official repository ```rocketmqinc/rocketmq```. +This script will get the latest release version of RocketMQ and build the docker images based on ```alpine``` and ```centos``` respectively, then push the new images to the current official repository ```apacherocketmq/rocketmq```. ### How to verify RocketMQ works well @@ -181,7 +181,7 @@ And put the customized `broker.conf` file at a specific path, like "`pwd`/data/b 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 ``` @@ -190,7 +190,7 @@ Finally we can find the customized `broker.conf` has been used in the broker con ``` 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 brokerClusterName = DefaultCluster brokerName = broker-a @@ -209,7 +209,7 @@ In the case of docker-compose, change the docker-compose.yml like following: version: '2' services: namesrv: - image: rocketmqinc/rocketmq:4.4.0 + image: apacherocketmq/rocketmq:4.4.0 container_name: rmqnamesrv ports: - 9876:9876 @@ -217,7 +217,7 @@ services: - ./data/namesrv/logs:/home/rocketmq/logs command: sh mqnamesrv broker: - image: rocketmqinc/rocketmq:4.4.0 + image: apacherocketmq/rocketmq:4.4.0 container_name: rmqbroker ports: - 10909:10909 diff --git a/product/start-broker.sh b/product/start-broker.sh index 2c70f5f..169e037 100644 --- a/product/start-broker.sh +++ b/product/start-broker.sh @@ -49,7 +49,7 @@ start_broker() --name rmqbroker \ -e "NAMESRV_ADDR=${NAMESRV_ADDR}" \ -p 10911:10911 -p 10912:10912 -p 10909:10909 \ - rocketmqinc/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \ + apacherocketmq/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \ sh mqbroker -c /home/rocketmq/conf/${CONF_FILE} } diff --git a/product/start-ns.sh b/product/start-ns.sh index e09eaca..cb82585 100644 --- a/product/start-ns.sh +++ b/product/start-ns.sh @@ -37,7 +37,7 @@ start_namesrv() docker run -d -v ${DATA_HOME}/logs:/home/rocketmq/logs \ --name rmqnamesrv \ -p 9876:9876 \ - rocketmqinc/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \ + apacherocketmq/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \ sh mqnamesrv } diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 70c52a7..6534e0d 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: #Service for nameserver namesrv: - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION container_name: rmqnamesrv ports: - 9876:9876 @@ -12,7 +12,7 @@ services: #Service for broker broker: - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION container_name: rmqbroker links: - namesrv @@ -30,7 +30,7 @@ services: #Service for another broker -- broker1 broker1: - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION container_name: rmqbroker-b links: - namesrv diff --git a/templates/kubernetes/deployment.yaml b/templates/kubernetes/deployment.yaml index 61824bf..cf226c8 100644 --- a/templates/kubernetes/deployment.yaml +++ b/templates/kubernetes/deployment.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: broker - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION command: ["sh","mqbroker", "-n","localhost:9876"] imagePullPolicy: IfNotPresent ports: @@ -23,7 +23,7 @@ spec: - mountPath: /home/rocketmq/store name: brokeroptstore - name: namesrv - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION command: ["sh","mqnamesrv"] imagePullPolicy: IfNotPresent ports: diff --git a/templates/kubernetes/deployment2.yaml b/templates/kubernetes/deployment2.yaml index c351b0e..9844a93 100644 --- a/templates/kubernetes/deployment2.yaml +++ b/templates/kubernetes/deployment2.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: rocketmq-nameserver - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION command: ["sh","mqnamesrv"] imagePullPolicy: IfNotPresent ports: @@ -48,7 +48,7 @@ spec: spec: containers: - name: rocketmq-broker - image: rocketmqinc/rocketmq:ROCKETMQ_VERSION + image: apacherocketmq/rocketmq:ROCKETMQ_VERSION command: ["sh","mqbroker", "-n","rocketmq-ns-deployment:9876"] imagePullPolicy: IfNotPresent ports: diff --git a/templates/play-docker-deledger.sh b/templates/play-docker-deledger.sh index 0df1254..e8c88a8 100755 --- a/templates/play-docker-deledger.sh +++ b/templates/play-docker-deledger.sh @@ -52,12 +52,12 @@ echo "Starting RocketMQ nodes..." docker network create --subnet=172.18.0.0/16 dledger-br # Start nameserver -docker run --net dledger-br --ip 172.18.0.11 -d -p 9876:9876 -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv rocketmqinc/rocketmq:ROCKETMQ_VERSION sh mqnamesrv +docker run --net dledger-br --ip 172.18.0.11 -d -p 9876:9876 -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv apacherocketmq/rocketmq:ROCKETMQ_VERSION sh mqnamesrv # Start Brokers -docker run --net dledger-br --ip 172.18.0.12 -d -p 30911:30911 -p 30909:30909 -v `pwd`/data/broker0/logs:/home/rocketmq/logs -v `pwd`/data/broker0/store:/home/rocketmq/store -v `pwd`/data/broker0/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" rocketmqinc/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf -docker run --net dledger-br --ip 172.18.0.13 -d -p 30921:30921 -p 30919:30919 -v `pwd`/data/broker1/logs:/home/rocketmq/logs -v `pwd`/data/broker1/store:/home/rocketmq/store -v `pwd`/data/broker1/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker1 --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" rocketmqinc/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf -docker run --net dledger-br --ip 172.18.0.14 -d -p 30931:30931 -p 30929:30929 -v `pwd`/data/broker2/logs:/home/rocketmq/logs -v `pwd`/data/broker2/store:/home/rocketmq/store -v `pwd`/data/broker2/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker2 --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" rocketmqinc/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf +docker run --net dledger-br --ip 172.18.0.12 -d -p 30911:30911 -p 30909:30909 -v `pwd`/data/broker0/logs:/home/rocketmq/logs -v `pwd`/data/broker0/store:/home/rocketmq/store -v `pwd`/data/broker0/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf +docker run --net dledger-br --ip 172.18.0.13 -d -p 30921:30921 -p 30919:30919 -v `pwd`/data/broker1/logs:/home/rocketmq/logs -v `pwd`/data/broker1/store:/home/rocketmq/store -v `pwd`/data/broker1/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker1 --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf +docker run --net dledger-br --ip 172.18.0.14 -d -p 30931:30931 -p 30929:30929 -v `pwd`/data/broker2/logs:/home/rocketmq/logs -v `pwd`/data/broker2/store:/home/rocketmq/store -v `pwd`/data/broker2/conf/dledger:/opt/rocketmq-ROCKETMQ_VERSION/conf/dledger --name rmqbroker2 --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:ROCKETMQ_VERSION sh mqbroker -c ../conf/dledger/broker.conf # Service unavailable when not ready # sleep 20 diff --git a/templates/play-docker-tls.sh b/templates/play-docker-tls.sh index 492075b..1612fe2 100755 --- a/templates/play-docker-tls.sh +++ b/templates/play-docker-tls.sh @@ -41,10 +41,10 @@ prepare_dir echo "Starting RocketMQ nodes..." # Start nameserver -docker run -d -v `pwd`/ssl:/home/rocketmq/ssl -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv -e "JAVA_OPT=-Dtls.test.mode.enable=false -Dtls.config.file=/home/rocketmq/ssl/ssl.properties -Dtls.test.mode.enable=false -Dtls.server.need.client.auth=required" rocketmqinc/rocketmq:ROCKETMQ_VERSION sh mqnamesrv +docker run -d -v `pwd`/ssl:/home/rocketmq/ssl -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv -e "JAVA_OPT=-Dtls.test.mode.enable=false -Dtls.config.file=/home/rocketmq/ssl/ssl.properties -Dtls.test.mode.enable=false -Dtls.server.need.client.auth=required" apacherocketmq/rocketmq:ROCKETMQ_VERSION sh mqnamesrv # Start Broker -docker run -d -v `pwd`/ssl:/home/rocketmq/ssl -v `pwd`/data/broker/logs:/home/rocketmq/logs -v `pwd`/data/broker/store:/home/rocketmq/store --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" -e "JAVA_OPT=-Dtls.enable=true -Dtls.client.authServer=true -Dtls.test.mode.enable=false -Dtls.config.file=/home/rocketmq/ssl/ssl.properties -Dtls.test.mode.enable=false -Dtls.server.mode=enforcing -Dtls.server.need.client.auth=required" rocketmqinc/rocketmq:ROCKETMQ_VERSION [...] +docker run -d -v `pwd`/ssl:/home/rocketmq/ssl -v `pwd`/data/broker/logs:/home/rocketmq/logs -v `pwd`/data/broker/store:/home/rocketmq/store --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" -e "JAVA_OPT=-Dtls.enable=true -Dtls.client.authServer=true -Dtls.test.mode.enable=false -Dtls.config.file=/home/rocketmq/ssl/ssl.properties -Dtls.test.mode.enable=false -Dtls.server.mode=enforcing -Dtls.server.need.client.auth=required" apacherocketmq/rocketmq:ROCKETMQ_VERSI [...] # Service unavailable when not ready # sleep 20 diff --git a/templates/play-docker.sh b/templates/play-docker.sh index 638cef4..aad4920 100755 --- a/templates/play-docker.sh +++ b/templates/play-docker.sh @@ -19,9 +19,9 @@ start_namesrv_broker() { TAG_SUFFIX=$1 # Start nameserver - docker run -d -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv rocketmqinc/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX} sh mqnamesrv + docker run -d -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name rmqnamesrv apacherocketmq/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX} sh mqnamesrv # Start Broker - docker run -d -v `pwd`/data/broker/logs:/home/rocketmq/logs -v `pwd`/data/broker/store:/home/rocketmq/store --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" rocketmqinc/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX} sh mqbroker + docker run -d -v `pwd`/data/broker/logs:/home/rocketmq/logs -v `pwd`/data/broker/store:/home/rocketmq/store --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX} sh mqbroker } if [ $# -lt 1 ]; then
