Skip to content
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

change the docker image #256

Merged
merged 2 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,12 @@ rabbitmq-server-tls:
cd compose/tls; git clone https://github.com/michaelklishin/tls-gen tls-gen; cd tls-gen/basic; make
mv compose/tls/tls-gen/basic/result/server_*_certificate.pem compose/tls/tls-gen/basic/result/server_certificate.pem
mv compose/tls/tls-gen/basic/result/server_*key.pem compose/tls/tls-gen/basic/result/server_key.pem
docker run -it --rm --name rabbitmq-stream-go-client-test \
docker run -d --name rabbitmq-stream-client-test \
-p 5552:5552 -p 5672:5672 -p 5671:5671 -p 5551:5551 -p 15672:15672 \
-v $(shell pwd)/compose/tls/conf/:/etc/rabbitmq/ -v $(shell pwd)/compose/tls/tls-gen/basic/result/:/certs \
-e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
--pull always \
pivotalrabbitmq/rabbitmq-stream

docker.io/rabbitmq:3.13-rc-management



12 changes: 6 additions & 6 deletions compose/ha_tls/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ services:
rabbit_node0:
environment:
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node0
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node0 advertised_port 5562
networks:
- back
hostname: node0
image: pivotalrabbitmq/rabbitmq-stream
image: docker.io/rabbitmq:3.13-rc-management
ports:
- "5561:5551"
- "5562:5552"
Expand All @@ -18,11 +18,11 @@ services:
rabbit_node1:
environment:
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node1
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node1 advertised_port 5572
networks:
- back
hostname: node1
image: pivotalrabbitmq/rabbitmq-stream
image: docker.io/rabbitmq:3.13-rc-management
ports:
- "5571:5551"
- "5572:5552"
Expand All @@ -33,11 +33,11 @@ services:
rabbit_node2:
environment:
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node2
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node2 advertised_port 5582
networks:
- back
hostname: node2
image: pivotalrabbitmq/rabbitmq-stream
image: docker.io/rabbitmq:3.13-rc-management
ports:
- "5581:5551"
- "5582:5552"
Expand Down
2 changes: 1 addition & 1 deletion compose/tls/conf/enabled_plugins
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[rabbitmq_management, rabbitmq_stream, rabbitmq_stream_management].
[rabbitmq_amqp1_0,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_stream,rabbitmq_stream_management].