From 0a4e5fefa5b80bdb6df9dcb82bfc1d1d07441c63 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 12 Aug 2020 18:24:07 +0300 Subject: [PATCH 1/2] Use load_definitions instead of management.load_definitions Closes #429 --- docker-entrypoint.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1b166047..a06e7099 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # https://www.rabbitmq.com/management.html#load-definitions managementDefinitionsFile='/etc/rabbitmq/definitions.json' if [ -f "$managementDefinitionsFile" ]; then - # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550 - rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile" + # We use `load_definitions` (the built-in setting as of 3.8.2+) instead + # of `management.load_definitions`. + # See https://github.com/docker-library/rabbitmq/issues/429 for details. + rabbit_set_config 'load_definitions' "$managementDefinitionsFile" fi fi fi From d1d424ea4f474a78ec7c5e1639f71210578434fa Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 27 Aug 2020 08:03:49 -0700 Subject: [PATCH 2/2] Apply template to image subdirectories --- 3.8-rc/alpine/docker-entrypoint.sh | 6 ++++-- 3.8-rc/ubuntu/docker-entrypoint.sh | 6 ++++-- 3.8/alpine/docker-entrypoint.sh | 6 ++++-- 3.8/ubuntu/docker-entrypoint.sh | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh index 852f3d43..e1685c06 100755 --- a/3.8-rc/alpine/docker-entrypoint.sh +++ b/3.8-rc/alpine/docker-entrypoint.sh @@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # https://www.rabbitmq.com/management.html#load-definitions managementDefinitionsFile='/etc/rabbitmq/definitions.json' if [ -f "$managementDefinitionsFile" ]; then - # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550 - rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile" + # We use `load_definitions` (the built-in setting as of 3.8.2+) instead + # of `management.load_definitions`. + # See https://github.com/docker-library/rabbitmq/issues/429 for details. + rabbit_set_config 'load_definitions' "$managementDefinitionsFile" fi fi fi diff --git a/3.8-rc/ubuntu/docker-entrypoint.sh b/3.8-rc/ubuntu/docker-entrypoint.sh index 1b166047..a06e7099 100755 --- a/3.8-rc/ubuntu/docker-entrypoint.sh +++ b/3.8-rc/ubuntu/docker-entrypoint.sh @@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # https://www.rabbitmq.com/management.html#load-definitions managementDefinitionsFile='/etc/rabbitmq/definitions.json' if [ -f "$managementDefinitionsFile" ]; then - # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550 - rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile" + # We use `load_definitions` (the built-in setting as of 3.8.2+) instead + # of `management.load_definitions`. + # See https://github.com/docker-library/rabbitmq/issues/429 for details. + rabbit_set_config 'load_definitions' "$managementDefinitionsFile" fi fi fi diff --git a/3.8/alpine/docker-entrypoint.sh b/3.8/alpine/docker-entrypoint.sh index 852f3d43..e1685c06 100755 --- a/3.8/alpine/docker-entrypoint.sh +++ b/3.8/alpine/docker-entrypoint.sh @@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # https://www.rabbitmq.com/management.html#load-definitions managementDefinitionsFile='/etc/rabbitmq/definitions.json' if [ -f "$managementDefinitionsFile" ]; then - # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550 - rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile" + # We use `load_definitions` (the built-in setting as of 3.8.2+) instead + # of `management.load_definitions`. + # See https://github.com/docker-library/rabbitmq/issues/429 for details. + rabbit_set_config 'load_definitions' "$managementDefinitionsFile" fi fi fi diff --git a/3.8/ubuntu/docker-entrypoint.sh b/3.8/ubuntu/docker-entrypoint.sh index 1b166047..a06e7099 100755 --- a/3.8/ubuntu/docker-entrypoint.sh +++ b/3.8/ubuntu/docker-entrypoint.sh @@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then # https://www.rabbitmq.com/management.html#load-definitions managementDefinitionsFile='/etc/rabbitmq/definitions.json' if [ -f "$managementDefinitionsFile" ]; then - # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550 - rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile" + # We use `load_definitions` (the built-in setting as of 3.8.2+) instead + # of `management.load_definitions`. + # See https://github.com/docker-library/rabbitmq/issues/429 for details. + rabbit_set_config 'load_definitions' "$managementDefinitionsFile" fi fi fi