Merge pull request #3189 from rabbitmq/docker-library-rabbitmq-500

Bring the docker image up to date with the docker-library version

Author: HoloRin

deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl

@@ -124,7 +124,11 @@ cluster_was_formed(Config) ->
     ?assertEqual(lists:sort(N2Nodes), lists:sort(N3Nodes)).
 
 register_tagged_task(Config) ->
+    RabbitmqDefaultUser = ?config(rabbitmq_default_user, Config),
+    RabbitmqDefaultPass = ?config(rabbitmq_default_pass, Config),
     RabbitmqConf = string:join([
+                                "default_user = " ++ RabbitmqDefaultUser,
+                                "default_pass = " ++ RabbitmqDefaultPass,
                                 "cluster_formation.peer_discovery_backend = aws",
                                 "cluster_formation.aws.instance_tags.service = rabbitmq",
                                 ""
@@ -133,7 +137,11 @@ register_tagged_task(Config) ->
     aws_ecs_util:register_task(Config, TaskJson).
 
 register_autoscaled_task(Config) ->
+    RabbitmqDefaultUser = ?config(rabbitmq_default_user, Config),
+    RabbitmqDefaultPass = ?config(rabbitmq_default_pass, Config),
     RabbitmqConf = string:join([
+                                "default_user = " ++ RabbitmqDefaultUser,
+                                "default_pass = " ++ RabbitmqDefaultPass,
                                 "cluster_formation.peer_discovery_backend = aws",
                                 "cluster_formation.aws.use_autoscaling_group = true",
                                 ""
@@ -156,11 +164,7 @@ task_json(Config, RabbitmqConf) ->
     RabbitContainerDef1 =
         RabbitContainerDef#{
                             <<"image">> := list_to_binary(RabbitmqImage),
-                            <<"environment">> := [#{<<"name">> => <<"RABBITMQ_DEFAULT_USER">>,
-                                                    <<"value">> => list_to_binary(RabbitmqDefaultUser)},
-                                                  #{<<"name">> => <<"RABBITMQ_DEFAULT_PASS">>,
-                                                    <<"value">> => list_to_binary(RabbitmqDefaultPass)},
-                                                  #{<<"name">> => <<"RABBITMQ_ERLANG_COOKIE">>,
+                            <<"environment">> := [#{<<"name">> => <<"RABBITMQ_ERLANG_COOKIE">>,
                                                     <<"value">> => list_to_binary(RabbitmqErlangCookie)}]
                            },
     SidecarContainerDef1 =

deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json

@@ -21,14 +21,6 @@
             ],
             "essential": true,
             "environment": [
-                {
-                    "name": "RABBITMQ_DEFAULT_USER",
-                    "value": "PLACEHOLDER"
-                },
-                {
-                    "name": "RABBITMQ_DEFAULT_PASS",
-                    "value": "PLACEHOLDER"
-                },
                 {
                     "name": "RABBITMQ_ERLANG_COOKIE",
                     "value": "PLACEHOLDER"

packaging/docker-image/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

packaging/docker-image/Dockerfile

@@ -250,6 +250,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 --chown=rabbitmq:rabbitmq 10-default-guest-user.conf /etc/rabbitmq/conf.d/
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 

packaging/docker-image/Makefile

@@ -19,7 +19,7 @@ else \
 fi)
 endif
 
-ifeq ($(filter-out all dist push,$(MAKECMDGOALS)),)
+ifeq ($(filter-out all dist push clean,$(MAKECMDGOALS)),)
 GENERIC_UNIX_ARCHIVE ?= $(wildcard $(PACKAGES_DIR)/rabbitmq-server-generic-unix-$(PROJECT_VERSION).tar.xz)
 
 ifeq ($(GENERIC_UNIX_ARCHIVE),)