Apply templates plus simplification

 - adjust 3.9 fragments to a single file
 - use jq template instead of seding the Dockerfile for the COPY

Author: yosifkit

conf.d/10-default-user.conf renamed to 10-default-guest-user.conf

@@ -1,3 +1,7 @@
+## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
+## see https://www.rabbitmq.com/configure.html for further information
+## on configuring RabbitMQ
+
 ## allow access to the guest user from anywhere on the network
 ## https://www.rabbitmq.com/access-control.html#loopback-users
 ## https://www.rabbitmq.com/production-checklist.html#users

3.9-rc/alpine/10-default-guest-user.conf

@@ -0,0 +1,8 @@
+## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
+## see https://www.rabbitmq.com/configure.html for further information
+## on configuring RabbitMQ
+
+## allow access to the guest user from anywhere on the network
+## https://www.rabbitmq.com/access-control.html#loopback-users
+## https://www.rabbitmq.com/production-checklist.html#users
+loopback_users.guest = false

3.9-rc/alpine/Dockerfile

@@ -0,0 +1,8 @@
+## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
+## see https://www.rabbitmq.com/configure.html for further information
+## on configuring RabbitMQ
+
+## allow access to the guest user from anywhere on the network
+## https://www.rabbitmq.com/access-control.html#loopback-users
+## https://www.rabbitmq.com/production-checklist.html#users
+loopback_users.guest = false

3.9-rc/ubuntu/10-default-guest-user.conf

@@ -270,8 +270,9 @@ VOLUME $RABBITMQ_DATA_DIR
 # https://docs.docker.com/samples/library/ubuntu/#locales
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
-COPY conf.d /etc/rabbitmq/
-
+{{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then "" else ( -}}
+COPY --chown=rabbitmq:rabbitmq 10-default-guest-user.conf /etc/rabbitmq/conf.d/
+{{ ) end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 

3.9-rc/ubuntu/Dockerfile

@@ -288,8 +288,9 @@ VOLUME $RABBITMQ_DATA_DIR
 # https://docs.docker.com/samples/library/ubuntu/#locales
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
-COPY conf.d /etc/rabbitmq/
-
+{{ if ([ "3.8", "3.8-rc" ] | index(env.version)) then "" else ( -}}
+COPY --chown=rabbitmq:rabbitmq 10-default-guest-user.conf /etc/rabbitmq/conf.d/
+{{ ) end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 

Dockerfile-alpine.template

@@ -48,10 +48,8 @@ for version; do
 		fi
 		cp -a "$entrypoint" "$version/$variant/docker-entrypoint.sh"
 
-		if [ "$rcVersion" = '3.8' ]; then
-			sed -i -e '/COPY conf.d/d' "$version/$variant/Dockerfile"
-		else
-			cp -aR "conf.d" "$version/$variant/"
+		if [ "$rcVersion" != '3.8' ]; then
+			cp 10-default-guest-user.conf "$version/$variant/"
 		fi
 
 		if [ "$variant" = 'alpine' ]; then