From f66ba3ccaa9da924b2df57f683b834c6ec41e3c1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 27 May 2021 15:16:56 -0700 Subject: [PATCH] Add a workaround for RABBITMQ_NODE_PORT for 3.8.3+ --- 3.8-rc/alpine/docker-entrypoint.sh | 4 ++-- 3.8-rc/ubuntu/docker-entrypoint.sh | 4 ++-- 3.8/alpine/docker-entrypoint.sh | 4 ++-- 3.8/ubuntu/docker-entrypoint.sh | 4 ++-- docker-entrypoint.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh index 69093e3a..3313817b 100755 --- a/3.8-rc/alpine/docker-entrypoint.sh +++ b/3.8-rc/alpine/docker-entrypoint.sh @@ -365,10 +365,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then fi if [ "$haveSslConfig" ]; then - rabbit_set_config 'listeners.ssl.default' 5671 + rabbit_set_config 'listeners.ssl.default' "${RABBITMQ_NODE_PORT:-5671}" rabbit_env_config 'ssl' "${sslConfigKeys[@]}" else - rabbit_set_config 'listeners.tcp.default' 5672 + rabbit_set_config 'listeners.tcp.default' "${RABBITMQ_NODE_PORT:-5672}" fi rabbit_env_config '' "${rabbitConfigKeys[@]}" diff --git a/3.8-rc/ubuntu/docker-entrypoint.sh b/3.8-rc/ubuntu/docker-entrypoint.sh index da789b92..c1ae5874 100755 --- a/3.8-rc/ubuntu/docker-entrypoint.sh +++ b/3.8-rc/ubuntu/docker-entrypoint.sh @@ -365,10 +365,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then fi if [ "$haveSslConfig" ]; then - rabbit_set_config 'listeners.ssl.default' 5671 + rabbit_set_config 'listeners.ssl.default' "${RABBITMQ_NODE_PORT:-5671}" rabbit_env_config 'ssl' "${sslConfigKeys[@]}" else - rabbit_set_config 'listeners.tcp.default' 5672 + rabbit_set_config 'listeners.tcp.default' "${RABBITMQ_NODE_PORT:-5672}" fi rabbit_env_config '' "${rabbitConfigKeys[@]}" diff --git a/3.8/alpine/docker-entrypoint.sh b/3.8/alpine/docker-entrypoint.sh index 69093e3a..3313817b 100755 --- a/3.8/alpine/docker-entrypoint.sh +++ b/3.8/alpine/docker-entrypoint.sh @@ -365,10 +365,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then fi if [ "$haveSslConfig" ]; then - rabbit_set_config 'listeners.ssl.default' 5671 + rabbit_set_config 'listeners.ssl.default' "${RABBITMQ_NODE_PORT:-5671}" rabbit_env_config 'ssl' "${sslConfigKeys[@]}" else - rabbit_set_config 'listeners.tcp.default' 5672 + rabbit_set_config 'listeners.tcp.default' "${RABBITMQ_NODE_PORT:-5672}" fi rabbit_env_config '' "${rabbitConfigKeys[@]}" diff --git a/3.8/ubuntu/docker-entrypoint.sh b/3.8/ubuntu/docker-entrypoint.sh index da789b92..c1ae5874 100755 --- a/3.8/ubuntu/docker-entrypoint.sh +++ b/3.8/ubuntu/docker-entrypoint.sh @@ -365,10 +365,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then fi if [ "$haveSslConfig" ]; then - rabbit_set_config 'listeners.ssl.default' 5671 + rabbit_set_config 'listeners.ssl.default' "${RABBITMQ_NODE_PORT:-5671}" rabbit_env_config 'ssl' "${sslConfigKeys[@]}" else - rabbit_set_config 'listeners.tcp.default' 5672 + rabbit_set_config 'listeners.tcp.default' "${RABBITMQ_NODE_PORT:-5672}" fi rabbit_env_config '' "${rabbitConfigKeys[@]}" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index da789b92..c1ae5874 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -365,10 +365,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then fi if [ "$haveSslConfig" ]; then - rabbit_set_config 'listeners.ssl.default' 5671 + rabbit_set_config 'listeners.ssl.default' "${RABBITMQ_NODE_PORT:-5671}" rabbit_env_config 'ssl' "${sslConfigKeys[@]}" else - rabbit_set_config 'listeners.tcp.default' 5672 + rabbit_set_config 'listeners.tcp.default' "${RABBITMQ_NODE_PORT:-5672}" fi rabbit_env_config '' "${rabbitConfigKeys[@]}"