public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

3.8.17-debian-10-r1 release

This commit is contained in:
Bitnami Bot 2021-06-11 06:10:35 +00:00
parent 9b36519805
commit 01f864ddae
10 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/rabbitmq/3.8/debian-10/Dockerfile
View File

@ -11,7 +11,7 @@ COPY prebuildfs /
# Install required system packages and dependencies
RUN install_packages acl ca-certificates curl gzip libc6 libssl1.1 libtinfo6 locales procps tar zlib1g
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "erlang" "23.3.4-2-0" --checksum 01c8c5feebb3755565c6cb948e620802a56e1ca7ca9f7d4b0151180eed6882fd
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.16-0" --checksum 93935c2472c6f7515e4f58883dfdfec4cec2e16630df091d01468929e9f95ed8
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "rabbitmq" "3.8.17-0" --checksum 6a116ed993a12e7af5ea356ed6ba219518e5a0cf616b2970f7c493198d53a873
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129
RUN chmod g+rwX /opt/bitnami
RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
@ -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.16-debian-10-r27" \
BITNAMI_IMAGE_VERSION="3.8.17-debian-10-r1" \
LANG="en_US.UTF-8" \
LANGUAGE="en_US:en"

2
bitnami/rabbitmq/3.8/debian-10/docker-compose.yml
View File

@ -8,6 +8,8 @@ services:
- '5672:5672'
- '25672:25672'
- '15672:15672'
environment:
- RABBITMQ_SECURE_PASSWORD=yes
volumes:
- 'rabbitmq_data:/bitnami'
volumes:

4
bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@ -15,9 +15,9 @@
},
"rabbitmq": {
"arch": "amd64",
"digest": "93935c2472c6f7515e4f58883dfdfec4cec2e16630df091d01468929e9f95ed8",
"digest": "6a116ed993a12e7af5ea356ed6ba219518e5a0cf616b2970f7c493198d53a873",
"distro": "debian-10",
"type": "NAMI",
"version": "3.8.16-0"
"version": "3.8.17-0"
}
}

29
bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/librabbitmq.sh
View File

@ -69,7 +69,7 @@ rabbitmq_validate() {
check_fqdn() {
if [[ "${!1}" == *.* ]]; then
if [[ "${RABBITMQ_USE_LONGNAME}" = false ]] ; then
if [[ "${RABBITMQ_USE_LONGNAME}" = false ]]; then
print_validation_error "The node name appears to be a fully qualified hostname and RABBITMQ_USE_LONGNAME is not set."
fi
fi
@ -252,7 +252,6 @@ rabbitmq_print_networking_configuration() {
fi
}
########################
# Prints RabbitMQ management configuration entries
# Globals:
@ -296,11 +295,11 @@ auth_backends.2 = internal
auth_ldap.port = $RABBITMQ_LDAP_SERVERS_PORT
auth_ldap.user_dn_pattern = $RABBITMQ_LDAP_USER_DN_PATTERN
EOF
read -r -a ldap_servers <<< "$(tr ',;' ' ' <<< "$RABBITMQ_LDAP_SERVERS")"
read -r -a ldap_servers <<<"$(tr ',;' ' ' <<<"$RABBITMQ_LDAP_SERVERS")"
local index=1
for server in "${ldap_servers[@]}"; do
echo "auth_ldap.servers.${index} = ${server}"
(( index++ ))
((index++))
done
if is_boolean_yes "$RABBITMQ_LDAP_TLS"; then
echo "auth_ldap.use_ssl = true"
@ -322,7 +321,7 @@ rabbitmq_print_resource_limits_configuration() {
echo "# Set a relative memory threshold"
if [[ "$memory_size" =~ %$ ]]; then
# Convert percentage to a relative value (< 1)
memory_size="$(awk '{ print $1 / 100 }' <<< "${memory_size//%/}")"
memory_size="$(awk '{ print $1 / 100 }' <<<"${memory_size//%/}")"
fi
# Only keep first three decimals
printf "vm_memory_high_watermark.relative = %.03f\n" "$memory_size"
@ -369,7 +368,7 @@ default_vhost = ${RABBITMQ_VHOST}
default_user = ${RABBITMQ_USERNAME}
EOF
# In most cases (i.e. container images), it is not a concern to specify the default password this way
! is_boolean_yes "$RABBITMQ_SECURE_PASSWORD" && cat <<< "default_pass = ${RABBITMQ_PASSWORD}"
! is_boolean_yes "$RABBITMQ_SECURE_PASSWORD" && cat <<<"default_pass = ${RABBITMQ_PASSWORD}"
echo
fi
@ -377,7 +376,7 @@ EOF
rabbitmq_print_management_configuration
rabbitmq_print_ldap_configuration
rabbitmq_print_resource_limits_configuration
) >> "$RABBITMQ_CONF_FILE"
) >>"$RABBITMQ_CONF_FILE"
}
########################
@ -411,7 +410,7 @@ rabbitmq_conf_set() {
replace_in_file "$RABBITMQ_CONF_FILE" "^[# ]*${key}\s*=.*" "${key} = ${value}" false
else
# Add a new key
printf '\n%s = %s' "$key" "$value" >> "$RABBITMQ_CONF_FILE"
printf '\n%s = %s' "$key" "$value" >>"$RABBITMQ_CONF_FILE"
fi
fi
}
@ -454,7 +453,7 @@ rabbitmq_erlang_ssl_dir() {
#########################
rabbitmq_create_combined_ssl_file() {
if [[ ! -f "$RABBITMQ_COMBINED_CERT_PATH" ]]; then
cat "$RABBITMQ_SSL_CERTFILE" "$RABBITMQ_SSL_KEYFILE" > "$RABBITMQ_COMBINED_CERT_PATH"
cat "$RABBITMQ_SSL_CERTFILE" "$RABBITMQ_SSL_KEYFILE" >"$RABBITMQ_COMBINED_CERT_PATH"
fi
}
@ -486,7 +485,7 @@ SERVER_ADDITIONAL_ERL_ARGS="-pa \$ERL_SSL_PATH
RABBITMQ_CTL_ERL_ARGS="\$SERVER_ADDITIONAL_ERL_ARGS"
EOF
fi
} > "$RABBITMQ_CONF_ENV_FILE"
} >"$RABBITMQ_CONF_ENV_FILE"
}
########################
@ -500,7 +499,7 @@ EOF
#########################
rabbitmq_download_community_plugins() {
debug "Downloading custom plugins..."
read -r -a plugins <<< "$(tr ',;' ' ' <<< "$RABBITMQ_COMMUNITY_PLUGINS")"
read -r -a plugins <<<"$(tr ',;' ' ' <<<"$RABBITMQ_COMMUNITY_PLUGINS")"
cd "$RABBITMQ_PLUGINS_DIR" || return
for plugin in "${plugins[@]}"; do
curl --remote-name --location --silent "$plugin"
@ -519,10 +518,10 @@ rabbitmq_download_community_plugins() {
#########################
rabbitmq_create_enabled_plugins_file() {
debug "Creating enabled_plugins file..."
local -a plugins=("rabbitmq_management_agent")
local -a plugins=("rabbitmq_management_agent" "rabbitmq_prometheus")
if [[ -n "${RABBITMQ_PLUGINS:-}" ]]; then
read -r -a extra_plugins_array <<< "$(tr ',;' ' ' <<< "$RABBITMQ_PLUGINS")"
read -r -a extra_plugins_array <<<"$(tr ',;' ' ' <<<"$RABBITMQ_PLUGINS")"
[[ "${#extra_plugins_array[@]}" -gt 0 ]] && plugins+=("${extra_plugins_array[@]}")
else
if [[ "$RABBITMQ_NODE_TYPE" = "stats" ]]; then
@ -530,7 +529,7 @@ rabbitmq_create_enabled_plugins_file() {
fi
is_boolean_yes "$RABBITMQ_ENABLE_LDAP" && plugins+=("rabbitmq_auth_backend_ldap")
fi
cat > "${RABBITMQ_CONF_DIR}/enabled_plugins" <<EOF
cat >"${RABBITMQ_CONF_DIR}/enabled_plugins" <<EOF
[$(echo "${plugins[@]}" | sed -E 's/\s+/,/g')].
EOF
}
@ -553,7 +552,7 @@ rabbitmq_create_erlang_cookie() {
RABBITMQ_ERL_COOKIE=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c32)
fi
echo "$RABBITMQ_ERL_COOKIE" > "${RABBITMQ_HOME_DIR}/.erlang.cookie"
echo "$RABBITMQ_ERL_COOKIE" >"${RABBITMQ_HOME_DIR}/.erlang.cookie"
}
########################

2
bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
View File

@ -105,7 +105,7 @@ export RABBITMQ_DAEMON_USER="rabbitmq"
export RABBITMQ_DAEMON_GROUP="rabbitmq"
# RabbitMQ settings
export RABBITMQ_SECURE_PASSWORD="${RABBITMQ_SECURE_PASSWORD:-yes}"
export RABBITMQ_SECURE_PASSWORD="${RABBITMQ_SECURE_PASSWORD:-no}"
export RABBITMQ_CLUSTER_NODE_NAME="${RABBITMQ_CLUSTER_NODE_NAME:-}"
export RABBITMQ_CLUSTER_PARTITION_HANDLING="${RABBITMQ_CLUSTER_PARTITION_HANDLING:-ignore}"
export RABBITMQ_DISK_FREE_RELATIVE_LIMIT="${RABBITMQ_DISK_FREE_RELATIVE_LIMIT:-1.0}"

14
bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq/postunpack.sh
View File

@ -19,3 +19,17 @@ for dir in "$RABBITMQ_BIN_DIR" "$RABBITMQ_CONF_DIR" "$RABBITMQ_DATA_DIR" "$RABBI
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"
# Adding symlinks to upstream RabbitMQ paths to make the container compatible with the RabbitMQ Cluster Operator
symlinks=(
"/etc/rabbitmq=${RABBITMQ_CONF_DIR}"
"/var/lib/rabbitmq=${RABBITMQ_HOME_DIR}"
"/var/lib/rabbitmq/mnesia=${RABBITMQ_DATA_DIR}"
"/var/log/rabbitmq=${RABBITMQ_LOG_DIR}"
)
for entry in "${symlinks[@]}"; do
link="${entry%=*}"
file="${entry#*=}"
ln -s "$file" "$link"
done

13
bitnami/rabbitmq/README.md
View File

@ -51,7 +51,7 @@ 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.8`, `3.8-debian-10`, `3.8.16`, `3.8.16-debian-10-r27`, `latest` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.16-debian-10-r27/3.8/debian-10/Dockerfile)
* [`3.8`, `3.8-debian-10`, `3.8.17`, `3.8.17-debian-10-r1`, `latest` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.17-debian-10-r1/3.8/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).
@ -193,7 +193,7 @@ Available variables:
* `RABBITMQ_VHOST`: RabbitMQ application vhost. Default: **/**
* `RABBITMQ_USERNAME`: RabbitMQ application username. Default: **user**
* `RABBITMQ_PASSWORD`: RabbitMQ application password. Default: **bitnami**
* `RABBITMQ_SECURE_PASSWORD`: Whether to set the RabbitMQ password securely. This is incompatible with loading external RabbitMQ definitions. Default: **yes**
* `RABBITMQ_SECURE_PASSWORD`: Whether to set the RabbitMQ password securely. This is incompatible with loading external RabbitMQ definitions. Default: **no**
* `RABBITMQ_LOAD_DEFINITIONS`: Whether to load external RabbitMQ definitions. This is incompatible with setting the RabbitMQ password securely. Default: **no**.
* `RABBITMQ_ERL_COOKIE`: Erlang cookie to determine whether different nodes are allowed to communicate with each other.
* `RABBITMQ_NODE_TYPE`: Node Type. Valid values: *stats*, *queue-ram* or *queue-disc*. Default: **stats**
@ -517,6 +517,13 @@ $ docker-compose up rabbitmq
## Notable changes
### 3.8.16-debian-10-r28
* Added several minor changes to make the container compatible with the [RabbitMQ Cluster Operator](https://github.com/rabbitmq/cluster-operator/):
* Add `/etc/rabbitmq`, `/var/log/rabbitmq` and `/var/lib/rabbitmq` as symlinks to the corresponding folders in `/opt/bitnami/rabbitmq`.
* Set the `RABBITMQ_SECURE_PASSWORD` password to `no` by default. This does not affect the Bitnami RabbitMQ helm as it sets that variable to `yes` by default.
* Enable the `rabbitmq-prometheus` plugin by default.
### 3.8.9-debian-10-r82
* Add script to be used as preStop hook on K8s environments. It waits until queues have synchronised
@ -560,7 +567,7 @@ $ docker-compose up rabbitmq
The following parameters have been renamed:
| From | To |
| From | To |
|----------------------------|------------------------------|
| `RABBITMQ_ERLANG_COOKIE` | `RABBITMQ_ERL_COOKIE` |
| `RABBITMQ_NODETYPE` | `RABBITMQ_NODE_TYPE` |

3
bitnami/rabbitmq/docker-compose-cluster.yml
View File

@ -6,6 +6,7 @@ services:
- RABBITMQ_NODE_TYPE=stats
- RABBITMQ_NODE_NAME=rabbit@stats
- RABBITMQ_ERL_COOKIE=s3cr3tc00ki3
- RABBITMQ_SECURE_PASSWORD=yes
ports:
- '15672:15672'
volumes:
@ -17,6 +18,7 @@ services:
- RABBITMQ_NODE_NAME=rabbit@queue-disc1
- RABBITMQ_CLUSTER_NODE_NAME=rabbit@stats
- RABBITMQ_ERL_COOKIE=s3cr3tc00ki3
- RABBITMQ_SECURE_PASSWORD=yes
volumes:
- 'rabbitmqdisc1_data:/bitnami'
queue-ram1:
@ -26,6 +28,7 @@ services:
- RABBITMQ_NODE_NAME=rabbit@queue-ram1
- RABBITMQ_CLUSTER_NODE_NAME=rabbit@stats
- RABBITMQ_ERL_COOKIE=s3cr3tc00ki3
- RABBITMQ_SECURE_PASSWORD=yes
volumes:
- 'rabbitmqram1_data:/bitnami'

1
bitnami/rabbitmq/docker-compose-ldap.yml
View File

@ -13,6 +13,7 @@ services:
- ./config/advanced.config:/bitnami/rabbitmq/conf/advanced.config:ro
environment:
- BITNAMI_DEBUG=true
- RABBITMQ_SECURE_PASSWORD=yes
- RABBITMQ_ENABLE_LDAP=yes
- RABBITMQ_LDAP_TLS=no
- RABBITMQ_LDAP_SERVERS=openldap

2
bitnami/rabbitmq/docker-compose.yml
View File

@ -8,6 +8,8 @@ services:
- '5672:5672'
- '25672:25672'
- '15672:15672'
environment:
- RABBITMQ_SECURE_PASSWORD=yes
volumes:
- 'rabbitmq_data:/bitnami'
volumes: