mirror of
https://github.com/bitnami/containers.git
synced 2026-03-16 06:49:12 +08:00
3.8.28-debian-10-r9 release
This commit is contained in:
@@ -27,7 +27,7 @@ RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
|
||||
ENV APP_VERSION="3.8.28" \
|
||||
BITNAMI_APP_NAME="rabbitmq" \
|
||||
BITNAMI_IMAGE_VERSION="3.8.28-debian-10-r8" \
|
||||
BITNAMI_IMAGE_VERSION="3.8.28-debian-10-r9" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US:en"
|
||||
|
||||
|
||||
@@ -110,7 +110,11 @@ rabbitmq_validate() {
|
||||
check_fqdn "RABBITMQ_NODE_NAME"
|
||||
|
||||
if is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
|
||||
is_boolean_yes "$RABBITMQ_SECURE_PASSWORD" && print_validation_error "The RABBITMQ_LOAD_DEFINITIONS and RABBITMQ_SECURE_PASSWORD environment variables cannot be enabled at once."
|
||||
if [[ -f "$RABBITMQ_DEFINITIONS_FILE" ]]; then
|
||||
is_boolean_yes "$RABBITMQ_SECURE_PASSWORD" && grep -q '"users"' "$RABBITMQ_DEFINITIONS_FILE" && warn 'A definition file with "users" was found. The RABBITMQ_SECURE_PASSWORD environment variables will be ignored.'
|
||||
else
|
||||
print_validation_error "The definitions file $RABBITMQ_DEFINITIONS_FILE is not found. Please ensure that the path is correct or change the RABBITMQ_DEFINITIONS_FILE variable."
|
||||
fi
|
||||
elif [[ -z "$RABBITMQ_PASSWORD" ]]; then
|
||||
print_validation_error "You must indicate a password"
|
||||
fi
|
||||
@@ -372,6 +376,11 @@ EOF
|
||||
echo
|
||||
fi
|
||||
|
||||
if is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
|
||||
cat <<EOF
|
||||
load_definitions = ${RABBITMQ_DEFINITIONS_FILE}
|
||||
EOF
|
||||
fi
|
||||
rabbitmq_print_networking_configuration
|
||||
rabbitmq_print_management_configuration
|
||||
rabbitmq_print_ldap_configuration
|
||||
@@ -766,8 +775,9 @@ rabbitmq_initialize() {
|
||||
fi
|
||||
else
|
||||
! is_rabbitmq_running && rabbitmq_start_bg
|
||||
|
||||
if is_boolean_yes "$RABBITMQ_SECURE_PASSWORD"; then
|
||||
if is_boolean_yes "$RABBITMQ_LOAD_DEFINITIONS"; then
|
||||
debug_execute "${RABBITMQ_BIN_DIR}/rabbitmqctl" add_user "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
|
||||
elif is_boolean_yes "$RABBITMQ_SECURE_PASSWORD"; then
|
||||
rabbitmq_change_password "$RABBITMQ_USERNAME" "$RABBITMQ_PASSWORD"
|
||||
fi
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
|
||||
# variable will be overridden with the value specified in that file
|
||||
rabbitmq_env_vars=(
|
||||
RABBITMQ_CONF_FILE
|
||||
RABBITMQ_DEFINITIONS_FILE
|
||||
RABBITMQ_SECURE_PASSWORD
|
||||
RABBITMQ_CLUSTER_NODE_NAME
|
||||
RABBITMQ_CLUSTER_PARTITION_HANDLING
|
||||
@@ -99,6 +100,7 @@ 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_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"
|
||||
export RABBITMQ_MOUNTED_CONF_DIR="${RABBITMQ_VOLUME_DIR}/conf"
|
||||
export PATH="${RABBITMQ_BIN_DIR}:${PATH}"
|
||||
|
||||
Reference in New Issue
Block a user