Skip to content

Commit

Permalink
apacherocketmq rename to apache (#61)
Browse files Browse the repository at this point in the history
Co-authored-by: yuntian.zb <[email protected]>
  • Loading branch information
odbozhou and yuntian.zb authored Sep 20, 2022
1 parent 68cfa1b commit 26c9937
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/apache/rocketmq-docker.svg)](http://isitmaintained.com/project/apache/rocketmq-docker "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/apache/rocketmq-docker.svg)](http://isitmaintained.com/project/apache/rocketmq-docker "Percentage of issues still open")
![Docker Automated](https://img.shields.io/docker/automated/apacherocketmq/rocketmq)
[![Docker Pulls](https://img.shields.io/docker/pulls/apacherocketmq/rocketmq-broker)](https://hub.docker.com/repository/docker/apache/rocketmq)
![Docker Automated](https://img.shields.io/docker/automated/apache/rocketmq)
[![Docker Pulls](https://img.shields.io/docker/pulls/apache/rocketmq-broker)](https://hub.docker.com/repository/docker/apache/rocketmq)
[![Docker TAG](https://img.shields.io/docker/v/apache/rocketmq?label=tags&sort=date)](https://hub.docker.com/r/apache/rocketmq/tags)
![Docker Iamge](https://img.shields.io/docker/image-size/apacherocketmq/rocketmq)
![Docker Iamge](https://img.shields.io/docker/image-size/apache/rocketmq)
![Twitter Follow](https://img.shields.io/twitter/follow/ApacheRocketMQ?style=social)

This is the Git repo of the Docker Image for Apache RocketMQ and official docker hub repo: https://hub.docker.com/repository/docker/apache/rocketmq
Expand Down Expand Up @@ -138,7 +138,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 ```apacherocketmq/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 ```apache/rocketmq```.

### How to verify RocketMQ works well

Expand Down Expand Up @@ -209,15 +209,15 @@ 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:/home/rocketmq/rocketmq-4.5.0/conf/broker.conf --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apacherocketmq/rocketmq:4.5.0 sh mqbroker -c /home/rocketmq/rocketmq-4.5.0/conf/broker.conf
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:/home/rocketmq/rocketmq-4.5.0/conf/broker.conf --name rmqbroker --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" apache/rocketmq:4.5.0 sh mqbroker -c /home/rocketmq/rocketmq-4.5.0/conf/broker.conf
```

Finally we can find the customized `broker.conf` has been used in the broker container. For example:

```
MacBook-Pro:4.5.0 huan$ docker ps |grep mqbroker
a32c67aed6dd apacherocketmq/rocketmq:4.5.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 apache/rocketmq:4.5.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
MacBook-Pro:4.5.0 $ docker exec -it a32c67aed6dd cat /home/rocketmq/rocketmq-4.5.0/conf/broker.conf
brokerClusterName = DefaultCluster
brokerName = broker-a
Expand All @@ -236,15 +236,15 @@ In the case of docker-compose, change the docker-compose.yml like following:
version: '2'
services:
namesrv:
image: apacherocketmq/rocketmq:4.5.0
image: apache/rocketmq:4.5.0
container_name: rmqnamesrv
ports:
- 9876:9876
volumes:
- ./data/namesrv/logs:/home/rocketmq/logs
command: sh mqnamesrv
broker:
image: apacherocketmq/rocketmq:4.5.0
image: apache/rocketmq:4.5.0
container_name: rmqbroker
ports:
- 10909:10909
Expand Down
4 changes: 2 additions & 2 deletions image-build/build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ checkVersion $ROCKETMQ_VERSION
# Build rocketmq
case "${BASE_IMAGE}" in
alpine)
docker build --no-cache -f Dockerfile-alpine -t apacherocketmq/rocketmq:${ROCKETMQ_VERSION}-alpine --build-arg version=${ROCKETMQ_VERSION} .
docker build --no-cache -f Dockerfile-alpine -t apache/rocketmq:${ROCKETMQ_VERSION}-alpine --build-arg version=${ROCKETMQ_VERSION} .
;;
centos)
docker build --no-cache -f Dockerfile-centos -t apacherocketmq/rocketmq:${ROCKETMQ_VERSION} --build-arg version=${ROCKETMQ_VERSION} .
docker build --no-cache -f Dockerfile-centos -t apache/rocketmq:${ROCKETMQ_VERSION} --build-arg version=${ROCKETMQ_VERSION} .
;;
*)
echo "${BASE_IMAGE} is not supported, supported base images: centos, alpine"
Expand Down
2 changes: 1 addition & 1 deletion image-build/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ do
else
TAG=${LATEST_VERSION}-${baseImage}
fi
docker push apacherocketmq/rocketmq:${TAG}
docker push apache/rocketmq:${TAG}
done
2 changes: 1 addition & 1 deletion product/start-broker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ start_broker()
--name rmqbroker \
-e "NAMESRV_ADDR=${NAMESRV_ADDR}" \
-p 10911:10911 -p 10912:10912 -p 10909:10909 \
apacherocketmq/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \
apache/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \
sh mqbroker -c /home/rocketmq/conf/${CONF_FILE}
}

Expand Down
2 changes: 1 addition & 1 deletion product/start-ns.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ start_namesrv()
docker run -d -v ${DATA_HOME}/logs:/home/rocketmq/logs \
--name rmqnamesrv \
-p 9876:9876 \
apacherocketmq/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \
apache/rocketmq:${ROCKETMQ_VERSION}${TAG_SUFFIX} \
sh mqnamesrv
}

Expand Down

0 comments on commit 26c9937

Please sign in to comment.