From 239e02264edf287507d6ff2afce7b6925211286c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 13 Jul 2022 20:51:28 +0000 Subject: [PATCH] 3.9.21-debian-11-r0 release --- bitnami/rabbitmq/3.9/debian-11/Dockerfile | 4 +-- .../opt/bitnami/.bitnami_components.json | 4 +-- .../rootfs/opt/bitnami/scripts/librabbitmq.sh | 36 +++++++++++++++++++ .../opt/bitnami/scripts/rabbitmq-env.sh | 1 + .../bitnami/scripts/rabbitmq/postunpack.sh | 4 +-- .../opt/bitnami/scripts/rabbitmq/setup.sh | 3 +- bitnami/rabbitmq/README.md | 2 +- 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/bitnami/rabbitmq/3.9/debian-11/Dockerfile b/bitnami/rabbitmq/3.9/debian-11/Dockerfile index 7af7828559dd..acdcd8504d97 100644 --- a/bitnami/rabbitmq/3.9/debian-11/Dockerfile +++ b/bitnami/rabbitmq/3.9/debian-11/Dockerfile @@ -11,7 +11,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gzip libc6 libgcc-s1 libssl1.1 libstdc++6 libtinfo6 locales procps tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-151" --checksum 089bb11a3bc6031c5a91ab5f9534e9e7e41b928d10d72a3986f16bb61d3a9900 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "erlang" "24.3.4-150" --checksum 1d1491a2dd0c467d9e968c85c5c7014fef59d521fabdda67f9f9583ed1030547 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.9.20-151" --checksum 724623d92559de2378ed417a8e5ef6c29fdbf26d9e68e50e2a73db1ee758e9b3 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.9.21-0" --checksum a5af7a84a14e182ee08cd0ec2c0ca16b89403fdf0bf208b4cc07defc7b07bd0a RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -24,7 +24,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="3.9.20" \ +ENV APP_VERSION="3.9.21" \ BITNAMI_APP_NAME="rabbitmq" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" diff --git a/bitnami/rabbitmq/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8dbd7f45c30c..145abbb8305e 100644 --- a/bitnami/rabbitmq/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,9 +15,9 @@ }, "rabbitmq": { "arch": "amd64", - "digest": "724623d92559de2378ed417a8e5ef6c29fdbf26d9e68e50e2a73db1ee758e9b3", + "digest": "a5af7a84a14e182ee08cd0ec2c0ca16b89403fdf0bf208b4cc07defc7b07bd0a", "distro": "debian-11", "type": "NAMI", - "version": "3.9.20-151" + "version": "3.9.21-0" } } \ No newline at end of file diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh index bdb72cc66ccb..123c8427b8e3 100644 --- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh +++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh @@ -786,3 +786,39 @@ rabbitmq_initialize() { fi fi } + +######################## +# Run custom initialization scripts +# Globals: +# RABBITMQ_* +# Arguments: +# None +# Returns:z< +# None +######################### +rabbitmq_custom_init_scripts() { + if [[ -n $(find "${RABBITMQ_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh") ]]; then + info "Loading user's custom files from $RABBITMQ_INITSCRIPTS_DIR ..." + local -r tmp_file="/tmp/filelist" + find "${RABBITMQ_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh" | sort >"$tmp_file" + while read -r f; do + case "$f" in + *.sh) + if [[ -x "$f" ]]; then + debug "Executing $f" + "$f" + else + debug "Sourcing $f" + . "$f" + fi + ;; + *) + debug "Ignoring $f" + ;; + esac + done <$tmp_file + rm -f "$tmp_file" + else + info "No custom scripts in $RABBITMQ_INITSCRIPTS_DIR" + fi +} diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index 79c9dae86d80..64835847d8ea 100644 --- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -98,6 +98,7 @@ export RABBITMQ_CONF_FILE="${RABBITMQ_CONF_FILE:-${RABBITMQ_CONF_DIR}/rabbitmq.c export RABBITMQ_CONF_ENV_FILE="${RABBITMQ_CONF_DIR}/rabbitmq-env.conf" export RABBITMQ_HOME_DIR="${RABBITMQ_BASE_DIR}/.rabbitmq" export RABBITMQ_LIB_DIR="${RABBITMQ_BASE_DIR}/var/lib/rabbitmq" +export RABBITMQ_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" export RABBITMQ_LOGS_DIR="${RABBITMQ_BASE_DIR}/var/log/rabbitmq" export RABBITMQ_DEFINITIONS_FILE="${RABBITMQ_DEFINITIONS_FILE:-/app/load_definition.json}" export RABBITMQ_PLUGINS_DIR="${RABBITMQ_BASE_DIR}/plugins" diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh index 684f5b083cdc..fec477287397 100755 --- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh +++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh @@ -15,10 +15,10 @@ set -o pipefail # Load RabbitMQ environment variables . /opt/bitnami/scripts/rabbitmq-env.sh -for dir in "$RABBITMQ_BIN_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_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_BIN_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DATA_DIR" "$RABBITMQ_HOME_DIR" "$RABBITMQ_LIB_DIR" "$RABBITMQ_LOGS_DIR" "$RABBITMQ_PLUGINS_DIR" +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" # Adding symlinks to upstream RabbitMQ paths to make the container compatible with the RabbitMQ Cluster Operator diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh index 67cbc750ac33..5ba6cd002938 100755 --- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh +++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/setup.sh @@ -22,4 +22,5 @@ trap "rabbitmq_stop" EXIT 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 diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md index 0054b03822ed..783cd8e2c06a 100644 --- a/bitnami/rabbitmq/README.md +++ b/bitnami/rabbitmq/README.md @@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.10`, `3.10-debian-11`, `3.10.6`, `3.10.6-debian-11-r0`, `latest` (3.10/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.10.6-debian-11-r0/3.10/debian-11/Dockerfile) -* [`3.9`, `3.9-debian-11`, `3.9.20`, `3.9.20-debian-11-r13` (3.9/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.20-debian-11-r13/3.9/debian-11/Dockerfile) +* [`3.9`, `3.9-debian-11`, `3.9.21`, `3.9.21-debian-11-r0` (3.9/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.21-debian-11-r0/3.9/debian-11/Dockerfile) * [`3.8`, `3.8-debian-11`, `3.8.35`, `3.8.35-debian-11-r0` (3.8/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.35-debian-11-r0/3.8/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).