Merge pull request #3040 from zhuocwang/master

feat:support rabbitmq v3.9
2021-08-17 17:32:16 +08:00 · 2021-08-17 17:32:16 +08:00 · c3f9863799
commit c3f9863799
parent 76ca731b8e 32ffc84d01
4 changed files with 5 additions and 5 deletions
--- 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 ##############################################

--- 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:
--- a/rabbitmq/management_agent.disable_metrics_collector.conf
+++ b/rabbitmq/management_agent.disable_metrics_collector.conf
@ -0,0 +1 @@
+management_agent.disable_metrics_collector = false
--- a/rabbitmq/rabbitmq.conf
+++ b/rabbitmq/rabbitmq.conf
@ -0,0 +1,2 @@
+default_user = guest
+default_pass = guest
				`@ -0,0 +1 @@`
				`management_agent.disable_metrics_collector = false`