Skip to content

Commit d1d424e

Browse files
committed
Apply template to image subdirectories
1 parent 0a4e5fe commit d1d424e

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

3.8-rc/alpine/docker-entrypoint.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
386386
# https://www.rabbitmq.com/management.html#load-definitions
387387
managementDefinitionsFile='/etc/rabbitmq/definitions.json'
388388
if [ -f "$managementDefinitionsFile" ]; then
389-
# see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550
390-
rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile"
389+
# We use `load_definitions` (the built-in setting as of 3.8.2+) instead
390+
# of `management.load_definitions`.
391+
# See https://github.com/docker-library/rabbitmq/issues/429 for details.
392+
rabbit_set_config 'load_definitions' "$managementDefinitionsFile"
391393
fi
392394
fi
393395
fi

3.8-rc/ubuntu/docker-entrypoint.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
386386
# https://www.rabbitmq.com/management.html#load-definitions
387387
managementDefinitionsFile='/etc/rabbitmq/definitions.json'
388388
if [ -f "$managementDefinitionsFile" ]; then
389-
# see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550
390-
rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile"
389+
# We use `load_definitions` (the built-in setting as of 3.8.2+) instead
390+
# of `management.load_definitions`.
391+
# See https://github.com/docker-library/rabbitmq/issues/429 for details.
392+
rabbit_set_config 'load_definitions' "$managementDefinitionsFile"
391393
fi
392394
fi
393395
fi

3.8/alpine/docker-entrypoint.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
386386
# https://www.rabbitmq.com/management.html#load-definitions
387387
managementDefinitionsFile='/etc/rabbitmq/definitions.json'
388388
if [ -f "$managementDefinitionsFile" ]; then
389-
# see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550
390-
rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile"
389+
# We use `load_definitions` (the built-in setting as of 3.8.2+) instead
390+
# of `management.load_definitions`.
391+
# See https://github.com/docker-library/rabbitmq/issues/429 for details.
392+
rabbit_set_config 'load_definitions' "$managementDefinitionsFile"
391393
fi
392394
fi
393395
fi

3.8/ubuntu/docker-entrypoint.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
386386
# https://www.rabbitmq.com/management.html#load-definitions
387387
managementDefinitionsFile='/etc/rabbitmq/definitions.json'
388388
if [ -f "$managementDefinitionsFile" ]; then
389-
# see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550
390-
rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile"
389+
# We use `load_definitions` (the built-in setting as of 3.8.2+) instead
390+
# of `management.load_definitions`.
391+
# See https://github.com/docker-library/rabbitmq/issues/429 for details.
392+
rabbit_set_config 'load_definitions' "$managementDefinitionsFile"
391393
fi
392394
fi
393395
fi

0 commit comments

Comments
 (0)