[bitnami/rabbitmq] Release 3.12.13-debian-12-r1 (#62910)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

bitnami/rabbitmq/3.12/debian-12/Dockerfile

@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-02-16T18:17:31Z" \
+      org.opencontainers.image.created="2024-02-21T09:18:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.12.13-debian-12-r0" \
+      org.opencontainers.image.ref.name="3.12.13-debian-12-r1" \
       org.opencontainers.image.title="rabbitmq" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.12.13"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libgcc-s1 libssl3 libstdc++6 libtinfo6 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "erlang-26.2.2-0-linux-${OS_ARCH}-debian-12" \
+      "erlang-26.2.2-1-linux-${OS_ARCH}-debian-12" \
       "rabbitmq-3.12.13-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \

bitnami/rabbitmq/3.12/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "26.2.2-0"
+        "version": "26.2.2-1"
     },
     "rabbitmq": {
         "arch": "amd64",

bitnami/rabbitmq/3.12/debian-12/rootfs/opt/bitnami/scripts/rabbitmq-env.sh

@@ -97,6 +97,7 @@ export RABBITMQ_BASE_DIR="/opt/bitnami/rabbitmq"
 export RABBITMQ_BIN_DIR="${RABBITMQ_BASE_DIR}/sbin"
 export RABBITMQ_DATA_DIR="${RABBITMQ_VOLUME_DIR}/mnesia"
 export RABBITMQ_CONF_DIR="${RABBITMQ_BASE_DIR}/etc/rabbitmq"
+export RABBITMQ_DEFAULT_CONF_DIR="${RABBITMQ_BASE_DIR}/etc/rabbitmq.default"
 RABBITMQ_CONF_FILE="${RABBITMQ_CONF_FILE:-"${RABBITMQ_CONFIG_FILE:-}"}"
 export RABBITMQ_CONF_FILE="${RABBITMQ_CONF_FILE:-${RABBITMQ_CONF_DIR}/rabbitmq.conf}"
 export RABBITMQ_CONF_ENV_FILE="${RABBITMQ_CONF_DIR}/rabbitmq-env.conf"

bitnami/rabbitmq/3.12/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/entrypoint.sh

@@ -19,6 +19,14 @@ set -o pipefail
 
 print_welcome_page
 
+if ! is_dir_empty "$RABBITMQ_DEFAULT_CONF_DIR"; then
+    # We add the copy from default config in the entrypoint to not break users 
+    # bypassing the setup.sh logic. If the file already exists do not overwrite (in
+    # case someone mounts a configuration file in /opt/bitnami/rabbitmq/etc/rabbitmq)
+    debug "Copying files from $RABBITMQ_DEFAULT_CONF_DIR to $RABBITMQ_CONF_DIR"
+    cp -nr "$RABBITMQ_DEFAULT_CONF_DIR"/. "$RABBITMQ_CONF_DIR"
+fi
+
 if [[ "$1" = "/opt/bitnami/scripts/rabbitmq/run.sh" ]]; then
     info "** Starting RabbitMQ setup **"
     /opt/bitnami/scripts/rabbitmq/setup.sh

bitnami/rabbitmq/3.12/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh

@@ -17,7 +17,7 @@ set -o pipefail
 # Load RabbitMQ environment variables
 . /opt/bitnami/scripts/rabbitmq-env.sh
 
-for dir in "$RABBITMQ_BIN_DIR" "$RABBITMQ_INITSCRIPTS_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DATA_DIR" "$RABBITMQ_HOME_DIR" "$RABBITMQ_LIB_DIR" "$RABBITMQ_LOGS_DIR" "$RABBITMQ_PLUGINS_DIR"; do
+for dir in "$RABBITMQ_BIN_DIR" "$RABBITMQ_INITSCRIPTS_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DEFAULT_CONF_DIR" "$RABBITMQ_DATA_DIR" "$RABBITMQ_HOME_DIR" "$RABBITMQ_LIB_DIR" "$RABBITMQ_LOGS_DIR" "$RABBITMQ_PLUGINS_DIR"; do
     ensure_dir_exists "$dir"
 done
 chmod -R g+rwX "$RABBITMQ_INITSCRIPTS_DIR" "$RABBITMQ_BIN_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DATA_DIR" "$RABBITMQ_HOME_DIR" "$RABBITMQ_LIB_DIR" "$RABBITMQ_LOGS_DIR" "$RABBITMQ_PLUGINS_DIR"
@@ -46,3 +46,9 @@ mkdir -p "/var/lib/rabbitmq/mnesia"
 chmod -R g+rwX "/var/lib/rabbitmq/mnesia"
 rm -rf "$RABBITMQ_DATA_DIR"
 ln -s "/var/lib/rabbitmq/mnesia" "$RABBITMQ_DATA_DIR"
+
+if ! is_dir_empty "$RABBITMQ_CONF_DIR"; then
+    # Copy all initially generated configuration files to the default directory
+    # (this is to avoid breaking when entrypoint is being overridden)
+    cp -r "${RABBITMQ_CONF_DIR}/"* "$RABBITMQ_DEFAULT_CONF_DIR"
+fi