From f16445c9f225154051344ab150b8eed09c3dd96f Mon Sep 17 00:00:00 2001
From: zhuocwang <drondyw@gmail.com>
Date: Mon, 16 Aug 2021 21:44:49 +0800
Subject: [PATCH 1/2] feat:support rabbitmq v3.9

---
 docker-compose.yml                                       | 5 ++---
 rabbitmq/management_agent.disable_metrics_collector.conf | 1 +
 rabbitmq/rabbitmq.conf                                   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 rabbitmq/management_agent.disable_metrics_collector.conf
 create mode 100644 rabbitmq/rabbitmq.conf

diff --git a/docker-compose.yml b/docker-compose.yml
index 5847a80b..5846dddd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -804,12 +804,11 @@ services:
         - "${RABBITMQ_MANAGEMENT_HTTP_HOST_PORT}:15672"
         - "${RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT}:15671"
       privileged: true
-      environment:
-        - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
-        - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
       hostname: laradock-rabbitmq
       volumes:
         - ${DATA_PATH_HOST}/rabbitmq:/var/lib/rabbitmq
+        - ./rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+        - ./rabbitmq/management_agent.disable_metrics_collector.conf:/etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
       depends_on:
         - php-fpm
       networks:
diff --git a/rabbitmq/management_agent.disable_metrics_collector.conf b/rabbitmq/management_agent.disable_metrics_collector.conf
new file mode 100644
index 00000000..cc680cc1
--- /dev/null
+++ b/rabbitmq/management_agent.disable_metrics_collector.conf
@@ -0,0 +1 @@
+management_agent.disable_metrics_collector = false
diff --git a/rabbitmq/rabbitmq.conf b/rabbitmq/rabbitmq.conf
new file mode 100644
index 00000000..a25686d6
--- /dev/null
+++ b/rabbitmq/rabbitmq.conf
@@ -0,0 +1,2 @@
+default_user = guest
+default_pass = guest

From 32ffc84d01730f03367b51220fac9a5a69ebf491 Mon Sep 17 00:00:00 2001
From: zhuocwang <drondyw@gmail.com>
Date: Tue, 17 Aug 2021 13:49:27 +0800
Subject: [PATCH 2/2] clean up .env.example

---
 .env.example | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.env.example b/.env.example
index 664e1454..53db7ce1 100644
--- a/.env.example
+++ b/.env.example
@@ -452,8 +452,6 @@ SQS_MANAGEMENT_HTTP_HOST_PORT=9325
 RABBITMQ_NODE_HOST_PORT=5672
 RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
 RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
-RABBITMQ_DEFAULT_USER=guest
-RABBITMQ_DEFAULT_PASS=guest
 
 ### MERCURE ##############################################