This is an automated email from the ASF dual-hosted git repository.
caigy 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 68cfa1b replace with official image (#56)
68cfa1b is described below
commit 68cfa1b15bdd566391bf478a40668cbaac69a716
Author: ltamber <[email protected]>
AuthorDate: Fri Aug 19 13:05:28 2022 +0800
replace with official image (#56)
---
templates/docker-compose/docker-compose.yml | 6 +++---
templates/kubernetes/deployment.yaml | 4 ++--
templates/kubernetes/deployment2.yaml | 4 ++--
templates/play-docker-dledger.sh | 8 ++++----
templates/play-docker-tls.sh | 4 ++--
templates/play-docker.sh | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/templates/docker-compose/docker-compose.yml
b/templates/docker-compose/docker-compose.yml
index ca39d02..0c552e9 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: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
container_name: rmqnamesrv
ports:
- 9876:9876
@@ -12,7 +12,7 @@ services:
#Service for broker
broker:
- image: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
container_name: rmqbroker
links:
- namesrv
@@ -30,7 +30,7 @@ services:
#Service for another broker -- broker1
broker1:
- image: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
container_name: rmqbroker-b
links:
- namesrv
diff --git a/templates/kubernetes/deployment.yaml
b/templates/kubernetes/deployment.yaml
index cf226c8..d64f896 100644
--- a/templates/kubernetes/deployment.yaml
+++ b/templates/kubernetes/deployment.yaml
@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: broker
- image: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/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: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
command: ["sh","mqnamesrv"]
imagePullPolicy: IfNotPresent
ports:
diff --git a/templates/kubernetes/deployment2.yaml
b/templates/kubernetes/deployment2.yaml
index 9844a93..201c007 100644
--- a/templates/kubernetes/deployment2.yaml
+++ b/templates/kubernetes/deployment2.yaml
@@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: rocketmq-nameserver
- image: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
command: ["sh","mqnamesrv"]
imagePullPolicy: IfNotPresent
ports:
@@ -48,7 +48,7 @@ spec:
spec:
containers:
- name: rocketmq-broker
- image: apacherocketmq/rocketmq:ROCKETMQ_VERSION
+ image: apache/rocketmq:ROCKETMQ_VERSION
command: ["sh","mqbroker", "-n","rocketmq-ns-deployment:9876"]
imagePullPolicy: IfNotPresent
ports:
diff --git a/templates/play-docker-dledger.sh b/templates/play-docker-dledger.sh
index e8c88a8..586d080 100755
--- a/templates/play-docker-dledger.sh
+++ b/templates/play-docker-dledger.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
apacherocketmq/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
apache/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"
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
+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"
apache/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"
apache/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"
apache/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 1612fe2..951f6fa 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"
apacherocketmq/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"
apache/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" apacherocketmq/rocketmq:ROCKETMQ_VERSI
[...]
+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" apache/rocketmq:ROCKETMQ_VERSION sh
mqbroker
# Service unavailable when not ready
# sleep 20
diff --git a/templates/play-docker.sh b/templates/play-docker.sh
index 04f47e0..649bb38 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 -p 9876:9876 apacherocketmq/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX}
sh mqnamesrv
+ docker run -d -v `pwd`/data/namesrv/logs:/home/rocketmq/logs --name
rmqnamesrv -p 9876:9876 apache/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" -p 10909:10909 -p 10911:10911
-p 10912:10912 apacherocketmq/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" -p 10909:10909 -p 10911:10911
-p 10912:10912 apache/rocketmq:ROCKETMQ_VERSION${TAG_SUFFIX} sh mqbroker
}
if [ $# -lt 1 ]; then
