Skip to content

Commit bd6cc65

Browse files
committed
Use configuration fragments
1 parent 6a4816c commit bd6cc65

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ VOLUME $RABBITMQ_DATA_DIR
270270
# https://docs.docker.com/samples/library/ubuntu/#locales
271271
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
272272

273-
COPY rabbitmq.conf /etc/rabbitmq/
273+
COPY conf.d /etc/rabbitmq/
274274

275275
COPY docker-entrypoint.sh /usr/local/bin/
276276
ENTRYPOINT ["docker-entrypoint.sh"]

Dockerfile-ubuntu.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ VOLUME $RABBITMQ_DATA_DIR
288288
# https://docs.docker.com/samples/library/ubuntu/#locales
289289
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
290290

291-
COPY rabbitmq.conf /etc/rabbitmq/
291+
COPY conf.d /etc/rabbitmq/
292292

293293
COPY docker-entrypoint.sh /usr/local/bin/
294294
ENTRYPOINT ["docker-entrypoint.sh"]

apply-templates.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ for version; do
4949
cp -a "$entrypoint" "$version/$variant/docker-entrypoint.sh"
5050

5151
if [ "$rcVersion" = '3.8' ]; then
52-
sed -i -e '/COPY rabbitmq.conf/d' "$version/$variant/Dockerfile"
52+
sed -i -e '/COPY conf.d/d' "$version/$variant/Dockerfile"
5353
else
54-
cp -a "rabbitmq.conf" "$version/$variant/"
54+
cp -aR "conf.d" "$version/$variant/"
5555
fi
5656

5757
if [ "$variant" = 'alpine' ]; then

conf.d/01-preamble.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
2+
## see https://www.rabbitmq.com/configure.html for further information
3+
## on configuring RabbitMQ

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@
22
## https://www.rabbitmq.com/access-control.html#loopback-users
33
## https://www.rabbitmq.com/production-checklist.html#users
44
loopback_users.guest = false
5-
6-
## DEFAULT SETTINGS ARE NOT MEANT TO BE TAKEN STRAIGHT INTO PRODUCTION
7-
## see https://www.rabbitmq.com/configure.html for further information
8-
## on configuring RabbitMQ

0 commit comments

Comments
 (0)