From b944ae25cb4b47fdff8c3fc4a2c5ac13ab155196 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 1 Apr 2022 15:38:43 +0000
Subject: [PATCH] 3.8.28-debian-10-r10 release

---
 bitnami/rabbitmq/3.8/debian-10/Dockerfile                 | 2 +-
 .../debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh   | 8 ++++----
 .../debian-10/rootfs/opt/bitnami/scripts/rabbitmq/run.sh  | 3 +++
 bitnami/rabbitmq/README.md                                | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bitnami/rabbitmq/3.8/debian-10/Dockerfile b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
index 855e37f93005..acca9def7e34 100644
--- a/bitnami/rabbitmq/3.8/debian-10/Dockerfile
+++ b/bitnami/rabbitmq/3.8/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.8.28" \
     BITNAMI_APP_NAME="rabbitmq" \
-    BITNAMI_IMAGE_VERSION="3.8.28-debian-10-r9" \
+    BITNAMI_IMAGE_VERSION="3.8.28-debian-10-r10" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en"
 
diff --git a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
index 72f113678c38..bdb72cc66ccb 100644
--- a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
+++ b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
@@ -755,9 +755,6 @@ rabbitmq_initialize() {
     chmod 400 "${RABBITMQ_HOME_DIR}/.erlang.cookie"
     ln -sf "${RABBITMQ_HOME_DIR}/.erlang.cookie" "${RABBITMQ_LIB_DIR}/.erlang.cookie"
 
-    # Resources limits: maximum number of open file descriptors
-    [[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]] && ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
-
     debug "Ensuring expected directories/files exist..."
     for dir in "$RABBITMQ_DATA_DIR" "$RABBITMQ_LIB_DIR" "$RABBITMQ_HOME_DIR"; do
         ensure_dir_exists "$dir"
@@ -776,7 +773,10 @@ rabbitmq_initialize() {
     else
         ! is_rabbitmq_running && rabbitmq_start_bg
         if is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
-            debug_execute "${RABBITMQ_BIN_DIR}/rabbitmqctl" add_user "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
+            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/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/run.sh b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
index 0500fc514ab4..1c3330e29c96 100755
--- a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
+++ b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/run.sh
@@ -37,6 +37,9 @@ if is_boolean_yes "$RABBITMQ_CLUSTER_REBALANCE"; then
     ) &
 fi
 
+# Resources limits: maximum number of open file descriptors
+[[ -n "${RABBITMQ_ULIMIT_NOFILES:-}" ]] && info "Setting file discripton limit to ${RABBITMQ_ULIMIT_NOFILES}" && ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
+
 info "** Starting RabbitMQ **"
 cd "$RABBITMQ_BASE_DIR"
 if am_i_root; then
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 59d637ed0cfd..2d7077d073a4 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`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)
+* [`3.8`, `3.8-debian-10`, `3.8.28`, `3.8.28-debian-10-r10` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.28-debian-10-r10/3.8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).