From c5bb8b6e3c056ff880573a2b63f87842ea5816d7 Mon Sep 17 00:00:00 2001
From: Tronje <t.krabbe+github@protonmail.com>
Date: Wed, 27 Sep 2023 16:04:10 +0200
Subject: [PATCH] Remove default vhost environment variable for RabbitMQ in
 Docker setup (#1167)

RABBITMQ_DEFAULT_VHOST is deprecated. As the default vhost setting
defaults to "/" anyway, it can be safely removed.

Fixes #1157.

Signed-off-by: Tronje Krabbe <t.krabbe+eclipse@protonmail.com>
Co-authored-by: Tronje Krabbe <t.krabbe+eclipse@protonmail.com>
---
 hawkbit-runtime/docker/docker-compose-stack.yml | 2 --
 hawkbit-runtime/docker/docker-compose.yml       | 2 --
 2 files changed, 4 deletions(-)

diff --git a/hawkbit-runtime/docker/docker-compose-stack.yml b/hawkbit-runtime/docker/docker-compose-stack.yml
index 850f60197..48a050918 100644
--- a/hawkbit-runtime/docker/docker-compose-stack.yml
+++ b/hawkbit-runtime/docker/docker-compose-stack.yml
@@ -41,8 +41,6 @@ services:
     deploy:
       restart_policy:
         condition: on-failure
-    environment:
-      RABBITMQ_DEFAULT_VHOST: "/"
 
   # ---------------------
   # hawkBit service
diff --git a/hawkbit-runtime/docker/docker-compose.yml b/hawkbit-runtime/docker/docker-compose.yml
index 0dee2c1b6..3c9de0752 100644
--- a/hawkbit-runtime/docker/docker-compose.yml
+++ b/hawkbit-runtime/docker/docker-compose.yml
@@ -16,8 +16,6 @@ services:
   # ---------------------
   rabbitmq:
     image: "rabbitmq:3-management"
-    environment:
-      RABBITMQ_DEFAULT_VHOST: "/"
     restart: always
     ports:
       - "15672:15672"