docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #430 from michaelklishin/docker-image-429 

Use load_definitions instead of management.load_definitions
This commit is contained in:
yosifkit 2020-08-27 09:11:50 -07:00 committed by GitHub
parent 86a695b426 d1d424ea4f
commit be3ec8479e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3.8-rc/alpine/docker-entrypoint.sh
View File

@ -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

6
3.8-rc/ubuntu/docker-entrypoint.sh
View File

@ -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

6
3.8/alpine/docker-entrypoint.sh
View File

@ -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

6
3.8/ubuntu/docker-entrypoint.sh
View File

@ -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

6
docker-entrypoint.sh
View File

@ -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