Use conf.d to enable console logging in RMQ 3.9+

This replaces the `RABBITMQ_LOGS=-` env variable.

Fixes #554

Author: lukebakken

10-default-guest-user.conf renamed to 10-defaults.conf

@@ -6,3 +6,7 @@
 ## https://www.rabbitmq.com/access-control.html#loopback-users
 ## https://www.rabbitmq.com/production-checklist.html#users
 loopback_users.guest = false
+
+## Send all logs to stdout/TTY. Necessary to see logs when running via
+## a container
+log.console = true

3.10-rc/alpine/10-default-guest-user.conf renamed to 3.10-rc/alpine/10-defaults.conf

@@ -211,9 +211,15 @@ ENV RABBITMQ_VERSION {{ .version }}
 ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
 ENV RABBITMQ_HOME=/opt/rabbitmq
 
+{{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then ( -}}
 # Add RabbitMQ to PATH, send all logs to TTY
 ENV PATH=$RABBITMQ_HOME/sbin:$PATH \
 	RABBITMQ_LOGS=-
+{{ )
+else ( -}}
+# Add RabbitMQ to PATH
+ENV PATH=$RABBITMQ_HOME/sbin:$PATH
+{{ ) end -}}
 
 # Install RabbitMQ
 RUN set -eux; \
@@ -276,7 +282,7 @@ VOLUME $RABBITMQ_DATA_DIR
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
 {{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then "" else ( -}}
-COPY --chown=rabbitmq:rabbitmq 10-default-guest-user.conf /etc/rabbitmq/conf.d/
+COPY --chown=rabbitmq:rabbitmq 10-defaults.conf /etc/rabbitmq/conf.d/
 {{ ) end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

3.10-rc/alpine/Dockerfile

@@ -222,9 +222,15 @@ ENV RABBITMQ_VERSION {{ .version }}
 ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
 ENV RABBITMQ_HOME=/opt/rabbitmq
 
+{{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then ( -}}
 # Add RabbitMQ to PATH, send all logs to TTY
 ENV PATH=$RABBITMQ_HOME/sbin:$PATH \
 	RABBITMQ_LOGS=-
+{{ )
+else ( -}}
+# Add RabbitMQ to PATH
+ENV PATH=$RABBITMQ_HOME/sbin:$PATH
+{{ ) end -}}
 
 # Install RabbitMQ
 RUN set -eux; \
@@ -294,7 +300,7 @@ VOLUME $RABBITMQ_DATA_DIR
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
 {{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then "" else ( -}}
-COPY --chown=rabbitmq:rabbitmq 10-default-guest-user.conf /etc/rabbitmq/conf.d/
+COPY --chown=rabbitmq:rabbitmq 10-defaults.conf /etc/rabbitmq/conf.d/
 {{ ) end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

3.10-rc/ubuntu/10-default-guest-user.conf renamed to 3.10-rc/ubuntu/10-defaults.conf

@@ -55,7 +55,7 @@ for version; do
 		cp -a "$entrypoint" "$version/$variant/docker-entrypoint.sh"
 
 		if [ "$rcVersion" != '3.8' ]; then
-			cp 10-default-guest-user.conf "$version/$variant/"
+			cp 10-defaults.conf "$version/$variant/"
 		fi
 
 		if [ "$variant" = 'alpine' ]; then