diff --git a/bitnami/rabbitmq/4.2/debian-12/Dockerfile b/bitnami/rabbitmq/4.2/debian-12/Dockerfile index a5edf92ada16..ae1d054761b6 100644 --- a/bitnami/rabbitmq/4.2/debian-12/Dockerfile +++ b/bitnami/rabbitmq/4.2/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-10-30T11:28:23Z" \ + org.opencontainers.image.created="2025-11-13T14:54:41Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq" \ @@ -54,7 +54,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh ENV APP_VERSION="4.2.0" \ BITNAMI_APP_NAME="rabbitmq" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" diff --git a/bitnami/rabbitmq/4.2/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh b/bitnami/rabbitmq/4.2/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh index 3651f916a2ca..b1e05b94faf6 100755 --- a/bitnami/rabbitmq/4.2/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh +++ b/bitnami/rabbitmq/4.2/debian-12/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh @@ -11,18 +11,27 @@ set -o pipefail # Load libraries . /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/librabbitmq.sh # Load RabbitMQ environment variables . /opt/bitnami/scripts/rabbitmq-env.sh -# Ensure RabbitMQ environment variables settings are valid -rabbitmq_validate -# Ensure RabbitMQ is stopped when this script ends. -trap "rabbitmq_stop" EXIT -# Ensure 'daemon' user exists when running as 'root' -am_i_root && ensure_user_exists "$RABBITMQ_DAEMON_USER" --group "$RABBITMQ_DAEMON_GROUP" -# Ensure RabbitMQ is initialized -rabbitmq_initialize -# Load custom init scripts -rabbitmq_custom_init_scripts +# Check whether we are deployed by the RabbitMQ Cluster Operator. This can be done by +# checking if the /operator folder exists +# https://github.com/rabbitmq/cluster-operator/blob/main/internal/resource/statefulset.go#L478 +if [[ -d "/operator" ]]; then + info "Container deployed by the RabbitMQ Cluster Operator. Skipping setup" +else + # Ensure RabbitMQ environment variables settings are valid + rabbitmq_validate + # Ensure RabbitMQ is stopped when this script ends. + trap "rabbitmq_stop" EXIT + # Ensure 'daemon' user exists when running as 'root' + am_i_root && ensure_user_exists "$RABBITMQ_DAEMON_USER" --group "$RABBITMQ_DAEMON_GROUP" + # Ensure RabbitMQ is initialized + rabbitmq_initialize + # Load custom init scripts + rabbitmq_custom_init_scripts +fi +