Skip to content

Update rabbitmq #8619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Update rabbitmq #8619

merged 1 commit into from
Aug 27, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 27, 2020

Changes:

Changes:

- docker-library/rabbitmq@be3ec84: Merge pull request docker-library/rabbitmq#430 from michaelklishin/docker-image-429
- docker-library/rabbitmq@d1d424e: Apply template to image subdirectories
@github-actions
Copy link

Diff for 168eedd:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6a8f38d..8492204 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/rabbitmq.git
 
 Tags: 3.8.7, 3.8, 3, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: be3ec8479e17a62efe55d18dd9d5dae37721afba
 Directory: 3.8/ubuntu
 
 Tags: 3.8.7-alpine, 3.8-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: be3ec8479e17a62efe55d18dd9d5dae37721afba
 Directory: 3.8/alpine
 
 Tags: 3.8.7-management, 3.8-management, 3-management, management
diff --git a/rabbitmq_alpine/docker-entrypoint.sh b/rabbitmq_alpine/docker-entrypoint.sh
index 852f3d4..e1685c0 100755
--- a/rabbitmq_alpine/docker-entrypoint.sh
+++ b/rabbitmq_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/rabbitmq_latest/docker-entrypoint.sh b/rabbitmq_latest/docker-entrypoint.sh
index 1b16604..a06e709 100755
--- a/rabbitmq_latest/docker-entrypoint.sh
+++ b/rabbitmq_latest/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

@tianon tianon merged commit aeae842 into docker-library:master Aug 27, 2020
@tianon tianon deleted the rabbitmq branch August 27, 2020 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants