3.8.26-debian-10-r8 release

2026-03-12 06:48:14 +08:00 · 2021-11-25 19:17:15 +00:00
parent 58e96bc46c
commit 56e0271369
7 changed files with 31 additions and 12 deletions
--- a/bitnami/rabbitmq/3.8/debian-10/Dockerfile
+++ b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
@@ -5,14 +5,14 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \
    OS_ARCH="amd64" \
    OS_FLAVOUR="debian-10" \
    OS_NAME="linux" \
-    PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:/opt/bitnami/common/bin:$PATH"
+    PATH="/opt/bitnami/common/bin:/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH"

 COPY prebuildfs /
 # Install required system packages and dependencies
 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 "erlang" "24.1.7-0" --checksum 1991fab774004363110a36c3087c27fd4f50bb9cc6a493738c6158a3516c1cfd
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.26-0" --checksum 3919a0f7d57bb2cb873740804d8b94f4710157c6c01a46b453c98aff5e409b26
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "erlang" "24.1.7-0" --checksum 1991fab774004363110a36c3087c27fd4f50bb9cc6a493738c6158a3516c1cfd
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.26-1" --checksum b5072d08e0938e3e0337c290822c99ce75a58e6811c935f8a77cbcd584aca7b8
 RUN chmod g+rwX /opt/bitnami
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
@@ -24,7 +24,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.26-debian-10-r5" \
+    BITNAMI_IMAGE_VERSION="3.8.26-debian-10-r8" \
    LANG="en_US.UTF-8" \
    LANGUAGE="en_US:en"

--- 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": "3919a0f7d57bb2cb873740804d8b94f4710157c6c01a46b453c98aff5e409b26",
+        "digest": "b5072d08e0938e3e0337c290822c99ce75a58e6811c935f8a77cbcd584aca7b8",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "3.8.26-0"
+        "version": "3.8.26-1"
    }
 }
--- 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
@@ -566,6 +566,9 @@ rabbitmq_create_erlang_cookie() {
 #   Boolean
 #########################
 is_rabbitmq_running() {
+    if [[ -z "${RABBITMQ_PID:-}" && -n "${RABBITMQ_PID_FILE:-}" ]]; then
+        RABBITMQ_PID="$(get_pid_from_file "$RABBITMQ_PID_FILE")"
+    fi
    if [[ -z "${RABBITMQ_PID:-}" ]]; then
        false
    else
@@ -573,6 +576,20 @@ is_rabbitmq_running() {
    fi
 }

+########################
+# Checks if RabbitMQ is not running
+# Globals:
+#   RABBITMQ_PID
+#   RABBITMQ_BIN_DIR
+# Arguments:
+#   None
+# Returns:
+#   Boolean
+#########################
+is_rabbitmq_not_running() {
+    ! is_rabbitmq_running
+}
+
 ########################
 # Checks if a RabbitMQ node is running
 # Globals:
--- a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
+++ b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
@@ -95,7 +95,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_LOG_DIR="${RABBITMQ_BASE_DIR}/var/log/rabbitmq"
+export RABBITMQ_LOGS_DIR="${RABBITMQ_BASE_DIR}/var/log/rabbitmq"
 export RABBITMQ_PLUGINS_DIR="${RABBITMQ_BASE_DIR}/plugins"
 export RABBITMQ_MOUNTED_CONF_DIR="${RABBITMQ_VOLUME_DIR}/conf"
 export PATH="${RABBITMQ_BIN_DIR}:${PATH}"
--- a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh
+++ b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh
@@ -9,15 +9,16 @@ set -o pipefail

 # Load libraries
 . /opt/bitnami/scripts/libfs.sh
+. /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/librabbitmq.sh

 # 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_LOG_DIR" "$RABBITMQ_PLUGINS_DIR"; do
+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
    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_LOG_DIR" "$RABBITMQ_PLUGINS_DIR"
+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"


 # Adding symlinks to upstream RabbitMQ paths to make the container compatible with the RabbitMQ Cluster Operator
@@ -25,7 +26,7 @@ chmod -R g+rwX "$RABBITMQ_BIN_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DATA_DIR" "$R
 symlinks=(
    "/etc/rabbitmq=${RABBITMQ_CONF_DIR}"
    "/var/lib/rabbitmq=${RABBITMQ_HOME_DIR}"
-    "/var/log/rabbitmq=${RABBITMQ_LOG_DIR}"
+    "/var/log/rabbitmq=${RABBITMQ_LOGS_DIR}"
 )

 for entry in "${symlinks[@]}"; do
--- 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
@@ -16,6 +16,7 @@ set -o pipefail
 . /opt/bitnami/scripts/rabbitmq-env.sh

 info "** Starting RabbitMQ **"
+cd "$RABBITMQ_BASE_DIR"
 if am_i_root; then
    exec gosu "$RABBITMQ_DAEMON_USER" "${RABBITMQ_BIN_DIR}/rabbitmq-server"
 else
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -50,8 +50,8 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).


-* [`3.9`, `3.9-debian-10`, `3.9.10`, `3.9.10-debian-10-r2`, `latest` (3.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.10-debian-10-r2/3.9/debian-10/Dockerfile)
-* [`3.8`, `3.8-debian-10`, `3.8.26`, `3.8.26-debian-10-r5` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.26-debian-10-r5/3.8/debian-10/Dockerfile)
+* [`3.9`, `3.9-debian-10`, `3.9.10`, `3.9.10-debian-10-r3`, `latest` (3.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.9.10-debian-10-r3/3.9/debian-10/Dockerfile)
+* [`3.8`, `3.8-debian-10`, `3.8.26`, `3.8.26-debian-10-r8` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.26-debian-10-r8/3.8/debian-10/Dockerfile)

 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).