From 1d9432d8a7e797d7fe56cf51ab7c6a4bf5c5e213 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 28 May 2021 10:57:01 -0700 Subject: [PATCH] Fix bug in detecting if management plugin is installed --- 3.8-rc/alpine/docker-entrypoint.sh | 2 +- 3.8-rc/ubuntu/docker-entrypoint.sh | 2 +- 3.8/alpine/docker-entrypoint.sh | 2 +- 3.8/ubuntu/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh index 3313817b..192676e3 100755 --- a/3.8-rc/alpine/docker-entrypoint.sh +++ b/3.8-rc/alpine/docker-entrypoint.sh @@ -375,7 +375,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # if management plugin is installed, generate config for it # https://www.rabbitmq.com/management.html#configuration - if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then + if [ "$(rabbitmq-plugins list -q -m -e '^rabbitmq_management$')" ]; then if [ "$haveManagementSslConfig" ]; then rabbit_set_config 'management.ssl.port' 15671 rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}" diff --git a/3.8-rc/ubuntu/docker-entrypoint.sh b/3.8-rc/ubuntu/docker-entrypoint.sh index c1ae5874..9dc14b79 100755 --- a/3.8-rc/ubuntu/docker-entrypoint.sh +++ b/3.8-rc/ubuntu/docker-entrypoint.sh @@ -375,7 +375,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # if management plugin is installed, generate config for it # https://www.rabbitmq.com/management.html#configuration - if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then + if [ "$(rabbitmq-plugins list -q -m -e '^rabbitmq_management$')" ]; then if [ "$haveManagementSslConfig" ]; then rabbit_set_config 'management.ssl.port' 15671 rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}" diff --git a/3.8/alpine/docker-entrypoint.sh b/3.8/alpine/docker-entrypoint.sh index 3313817b..192676e3 100755 --- a/3.8/alpine/docker-entrypoint.sh +++ b/3.8/alpine/docker-entrypoint.sh @@ -375,7 +375,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # if management plugin is installed, generate config for it # https://www.rabbitmq.com/management.html#configuration - if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then + if [ "$(rabbitmq-plugins list -q -m -e '^rabbitmq_management$')" ]; then if [ "$haveManagementSslConfig" ]; then rabbit_set_config 'management.ssl.port' 15671 rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}" diff --git a/3.8/ubuntu/docker-entrypoint.sh b/3.8/ubuntu/docker-entrypoint.sh index c1ae5874..9dc14b79 100755 --- a/3.8/ubuntu/docker-entrypoint.sh +++ b/3.8/ubuntu/docker-entrypoint.sh @@ -375,7 +375,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # if management plugin is installed, generate config for it # https://www.rabbitmq.com/management.html#configuration - if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then + if [ "$(rabbitmq-plugins list -q -m -e '^rabbitmq_management$')" ]; then if [ "$haveManagementSslConfig" ]; then rabbit_set_config 'management.ssl.port' 15671 rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c1ae5874..9dc14b79 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -375,7 +375,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # if management plugin is installed, generate config for it # https://www.rabbitmq.com/management.html#configuration - if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then + if [ "$(rabbitmq-plugins list -q -m -e '^rabbitmq_management$')" ]; then if [ "$haveManagementSslConfig" ]; then rabbit_set_config 'management.ssl.port' 15671 rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"