Address review comments

- add newline at end of rabbitmq.conf
- drop rhs filename in Dockerfile COPY
- drop $conf variable from shell

Author: HoloRin

Dockerfile-alpine.template

@@ -270,7 +270,7 @@ 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 rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
+COPY rabbitmq.conf /etc/rabbitmq/
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

Dockerfile-ubuntu.template

@@ -288,7 +288,7 @@ 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 rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
+COPY rabbitmq.conf /etc/rabbitmq/
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

apply-templates.sh

@@ -41,8 +41,7 @@ for version; do
 			gawk -f "$jqt" "Dockerfile-$variant.template"
 		} > "$version/$variant/Dockerfile"
 
-		conf='rabbitmq.conf'
-		cp -a "$conf" "$version/$variant/rabbitmq.conf"
+		cp -a "rabbitmq.conf" "$version/$variant/rabbitmq.conf"
 
 		entrypoint='docker-entrypoint.sh'
 		rcVersion="${version%-rc}"

rabbitmq.conf

@@ -5,4 +5,4 @@ loopback_users.guest = false
 
 ## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
 ## see https://www.rabbitmq.com/configure.html for further information
-## on configuring RabbitMQ
+## on configuring RabbitMQ