-
Notifications
You must be signed in to change notification settings - Fork 248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Adapted to RocketMQ 5.x docker compose #101
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,9 +46,18 @@ fi | |
echo "mkdir $STAGE_DIR/$version" | ||
mkdir -p "$STAGE_DIR/$version" | ||
|
||
cp -rf "$CURRENT_DIR/templates/" "$STAGE_DIR/$version" | ||
cp -rf "$CURRENT_DIR/templates" "$STAGE_DIR/$version" | ||
|
||
echo "staged templates into folder $STAGE_DIR/$version" | ||
|
||
# Replace string "ROCKETMQ_VERSION" with real version in all files under $STAGE_DIR/$version | ||
find "$STAGE_DIR/$version" -type f | xargs perl -pi -e "s/ROCKETMQ_VERSION/${version}/g" | ||
find "$STAGE_DIR/$version" -type f | xargs perl -pi -e "s/ROCKETMQ_VERSION/${version}/g" | ||
|
||
|
||
if [[ "${version}" > "5.0.0" ]]; then | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. rmq5 也可以不使用 proxy,单独部署broker。这里后续相当于只要5.x以上的,docker compose。就有proxy对吧。用户根据自己的需求,连接proxy/ns 来实现不同的case |
||
cp $STAGE_DIR/$version/templates/docker-compose/rmq5-docker-compose.yml $STAGE_DIR/$version/templates/docker-compose/docker-compose.yml | ||
else | ||
cp $STAGE_DIR/$version/templates/docker-compose/rmq4-docker-compose.yml $STAGE_DIR/$version/templates/docker-compose/docker-compose.yml | ||
fi | ||
|
||
rm $STAGE_DIR/$version/templates/docker-compose/rmq4-docker-compose.yml $STAGE_DIR/$version/templates/docker-compose/rmq5-docker-compose.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"rocketMQClusterName": "DefaultCluster" | ||
} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
version: '2' | ||
services: | ||
#Service for nameserver | ||
namesrv: | ||
image: apache/rocketmq:ROCKETMQ_VERSION | ||
container_name: rmqnamesrv | ||
ports: | ||
- 9876:9876 | ||
volumes: | ||
- ./data/namesrv/logs:/home/rocketmq/logs | ||
command: sh mqnamesrv | ||
|
||
#Service for broker | ||
broker: | ||
image: apache/rocketmq:ROCKETMQ_VERSION | ||
container_name: rmqbroker | ||
links: | ||
- namesrv | ||
ports: | ||
- 10909:10909 | ||
- 10911:10911 | ||
- 10912:10912 | ||
environment: | ||
- NAMESRV_ADDR=namesrv:9876 | ||
volumes: | ||
- ./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 /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf | ||
|
||
#Service for another broker -- broker1 | ||
broker1: | ||
image: apache/rocketmq:ROCKETMQ_VERSION | ||
container_name: rmqbroker-b | ||
links: | ||
- namesrv | ||
ports: | ||
- 10929:10909 | ||
- 10931:10911 | ||
- 10932:10912 | ||
environment: | ||
- NAMESRV_ADDR=namesrv:9876 | ||
volumes: | ||
- ./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 /opt/rocketmq-ROCKETMQ_VERSION/conf/broker.conf | ||
|
||
#Service for proxy | ||
proxy: | ||
image: apache/rocketmq:ROCKETMQ_VERSION | ||
container_name: rmqproxy | ||
links: | ||
- namesrv | ||
- broker | ||
- broker1 | ||
depends_on: | ||
- broker | ||
- broker1 | ||
ports: | ||
- 8080:8080 | ||
- 8081:8081 | ||
zzjcool marked this conversation as resolved.
Show resolved
Hide resolved
|
||
restart: on-failure | ||
environment: | ||
- NAMESRV_ADDR=namesrv:9876 | ||
volumes: | ||
- ./proxy/logs:/home/rocketmq/logs | ||
- ./proxy/conf/rmq-proxy.json:/opt/rocketmq-ROCKETMQ_VERSION/conf/rmq-proxy.json | ||
command: sh mqproxy -pc /opt/rocketmq-ROCKETMQ_VERSION/conf/rmq-proxy.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这行会兼容mac和linux的cp命令,可以解决readme中提到的手动处理的问题。