From 1c5be6132b7ce3a86b60e6c2b8ee043a273b49ff Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 1 Apr 2022 09:27:09 +0000
Subject: [PATCH] 3.9.14-debian-10-r10 release

---
 bitnami/rabbitmq/3.9/debian-10/Dockerfile              |  2 +-
 .../rootfs/opt/bitnami/scripts/librabbitmq.sh          | 10 +++++++---
 bitnami/rabbitmq/README.md                             |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bitnami/rabbitmq/3.9/debian-10/Dockerfile b/bitnami/rabbitmq/3.9/debian-10/Dockerfile
index c08b4935139e..83d988626774 100644
--- a/bitnami/rabbitmq/3.9/debian-10/Dockerfile
+++ b/bitnami/rabbitmq/3.9/debian-10/Dockerfile
@@ -27,7 +27,7 @@ RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV APP_VERSION="3.9.14" \
     BITNAMI_APP_NAME="rabbitmq" \
-    BITNAMI_IMAGE_VERSION="3.9.14-debian-10-r9" \
+    BITNAMI_IMAGE_VERSION="3.9.14-debian-10-r10" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en"
 
diff --git a/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
index 5396fbe9af71..9c69058ac2ff 100644
--- a/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
+++ b/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
@@ -366,7 +366,7 @@ default_permissions.write = .*
 EOF
 
         # When loading definitions, default vhost and user/pass won't be created: https://www.rabbitmq.com/definitions.html#import-on-boot
-        if ! is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS" || ! grep -q '"users"' "$RABBITMQ_DEFINITIONS_FILE"; then
+        if ! is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
             cat <<EOF
 default_vhost = ${RABBITMQ_VHOST}
 default_user = ${RABBITMQ_USERNAME}
@@ -775,8 +775,12 @@ rabbitmq_initialize() {
         fi
     else
         ! is_rabbitmq_running && rabbitmq_start_bg
-
-        if is_boolean_yes "$RABBITMQ_SECURE_PASSWORD"; then
+        if is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
+            if ! grep -q '"users"' "$RABBITMQ_DEFINITIONS_FILE"; then
+                debug_execute "${RABBITMQ_BIN_DIR}/rabbitmqctl" add_user "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
+                debug_execute "${RABBITMQ_BIN_DIR}/rabbitmqctl" set_user_tags "$RABBITMQ_USERNAME" administrator
+            fi
+        elif is_boolean_yes "$RABBITMQ_SECURE_PASSWORD"; then
             rabbitmq_change_password "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
         fi
 
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index ad4c83698051..59d637ed0cfd 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -50,7 +50,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3.9`, `3.9-debian-10`, `3.9.14`, `3.9.14-debian-10-r9`, `latest` (3.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.14-debian-10-r9/3.9/debian-10/Dockerfile)
+* [`3.9`, `3.9-debian-10`, `3.9.14`, `3.9.14-debian-10-r10`, `latest` (3.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.14-debian-10-r10/3.9/debian-10/Dockerfile)
 * [`3.8`, `3.8-debian-10`, `3.8.28`, `3.8.28-debian-10-r9` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.28-debian-10-r9/3.8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).