From b8f0d6b15a7cef578f75b1bd0a650b7a3c62ea50 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 22 Mar 2022 15:07:58 +0000
Subject: [PATCH] 3.8.28-debian-10-r0 release

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

diff --git a/bitnami/rabbitmq/3.8/debian-10/Dockerfile b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
index d79578b08f50..fb39aa2c109c 100644
--- a/bitnami/rabbitmq/3.8/debian-10/Dockerfile
+++ b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
@@ -12,7 +12,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 libssl1.1 libstdc++6 libtinfo6 locales procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "erlang" "24.3.2-0" --checksum 5370ef04650db5517aefe4c55472c57042ba6901ad900b6925ca2e18a7f0c728
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.27-9" --checksum 8eb1f074bcb63f0adb86cf3d24856786706e6f80306d874d73fe43a9e6627275
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.28-0" --checksum d5cab16f32f4cc33904a9d8710231b80051442cccefdfd9da2a2f17fa1612c96
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
@@ -26,7 +26,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="rabbitmq" \
-    BITNAMI_IMAGE_VERSION="3.8.27-debian-10-r62" \
+    BITNAMI_IMAGE_VERSION="3.8.28-debian-10-r0" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en"
 
diff --git a/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index ac5e1f575437..727dbc4a4fd6 100644
--- a/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,9 +15,9 @@
     },
     "rabbitmq": {
         "arch": "amd64",
-        "digest": "8eb1f074bcb63f0adb86cf3d24856786706e6f80306d874d73fe43a9e6627275",
+        "digest": "d5cab16f32f4cc33904a9d8710231b80051442cccefdfd9da2a2f17fa1612c96",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "3.8.27-9"
+        "version": "3.8.28-0"
     }
 }
\ No newline at end of file
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 3a8ca75dfa3d..5504739fc945 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,7 +755,9 @@ rabbitmq_initialize() {
         am_i_root && chown -R "$RABBITMQ_DAEMON_USER:$RABBITMQ_DAEMON_GROUP" "$dir"
     done
 
-    if ! is_mounted_dir_empty "$RABBITMQ_DATA_DIR"; then
+    # Use realpath to avoid symlink issues
+    # ref: https://github.com/bitnami/bitnami-docker-rabbitmq/pull/184
+    if ! is_mounted_dir_empty "$(realpath "$RABBITMQ_DATA_DIR")"; then
         info "Persisted data detected. Restoring..."
         if is_boolean_yes "$RABBITMQ_FORCE_BOOT" && ! is_dir_empty "${RABBITMQ_DATA_DIR}/${RABBITMQ_NODE_NAME}"; then
             # ref: https://www.rabbitmq.com/rabbitmqctl.8.html#force_boot
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 7913489e1563..62908329179c 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.13`, `3.9.13-debian-10-r61`, `latest` (3.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.13-debian-10-r61/3.9/debian-10/Dockerfile)
-* [`3.8`, `3.8-debian-10`, `3.8.27`, `3.8.27-debian-10-r62` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.27-debian-10-r62/3.8/debian-10/Dockerfile)
+* [`3.8`, `3.8-debian-10`, `3.8.28`, `3.8.28-debian-10-r0` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.28-debian-10-r0/3.8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).