6.2.5-debian-10-r43 release

This commit is contained in:
Bitnami Bot 2021-09-07 18:25:17 +00:00
parent d0386d97e6
commit 38a31205ae
5 changed files with 52 additions and 8 deletions

View File

@ -16,7 +16,7 @@ RUN chmod g+rwX /opt/bitnami
COPY rootfs /
RUN /opt/bitnami/scripts/redis-cluster/postunpack.sh
ENV BITNAMI_APP_NAME="redis-cluster" \
BITNAMI_IMAGE_VERSION="6.2.5-debian-10-r42" \
BITNAMI_IMAGE_VERSION="6.2.5-debian-10-r43" \
PATH="/opt/bitnami/redis/bin:/opt/bitnami/common/bin:$PATH"
EXPOSE 6379

View File

@ -137,6 +137,19 @@ generate_cron_conf() {
fi
}
########################
# Remove a cron configuration file for a given service
# Arguments:
# $1 - Service name
# Returns:
# None
#########################
remove_cron_conf() {
local service_name="${1:?service name is missing}"
local cron_conf_dir="/etc/monit/conf.d"
rm -f "${cron_conf_dir}/${service_name}"
}
########################
# Generate a monit configuration file for a given service
# Arguments:
@ -183,6 +196,19 @@ check process ${service_name}
EOF
}
########################
# Remove a monit configuration file for a given service
# Arguments:
# $1 - Service name
# Returns:
# None
#########################
remove_monit_conf() {
local service_name="${1:?service name is missing}"
local monit_conf_dir="/etc/monit/conf.d"
rm -f "${monit_conf_dir}/${service_name}.conf"
}
########################
# Generate a logrotate configuration file
# Arguments:
@ -233,3 +259,16 @@ $(indent "$extra" 2)
}
EOF
}
########################
# Remove a logrotate configuration file
# Arguments:
# $1 - Service name
# Returns:
# None
#########################
remove_logrotate_conf() {
local service_name="${1:?service name is missing}"
local logrotate_conf_dir="/etc/logrotate.d"
rm -f "${logrotate_conf_dir}/${service_name}"
}

View File

@ -20,14 +20,16 @@
# REDIS_BASE_DIR
# Arguments:
# $1 - key
# $2 - conf file
# Returns:
# None
#########################
redis_conf_get() {
local -r key="${1:?missing key}"
local -r conf_file="${2:-"${REDIS_BASE_DIR}/etc/redis.conf"}"
if grep -q -E "^\s*$key " "${REDIS_BASE_DIR}/etc/redis.conf"; then
grep -E "^\s*$key " "${REDIS_BASE_DIR}/etc/redis.conf" | awk '{print $2}'
if grep -q -E "^\s*$key " "$conf_file"; then
grep -E "^\s*$key " "$conf_file" | awk '{print $2}'
fi
}
@ -100,13 +102,14 @@ redis_major_version() {
# Globals:
# REDIS_BASE_DIR
# Arguments:
# None
# $1 - pid file
# Returns:
# Boolean
#########################
is_redis_running() {
local pid_file="${1:-"${REDIS_BASE_DIR}/tmp/redis.pid"}"
local pid
pid="$(get_pid_from_file "$REDIS_BASE_DIR/tmp/redis.pid")"
pid="$(get_pid_from_file "$pid_file")"
if [[ -z "$pid" ]]; then
false
@ -120,12 +123,12 @@ is_redis_running() {
# Globals:
# REDIS_BASE_DIR
# Arguments:
# None
# $1 - pid file
# Returns:
# Boolean
#########################
is_redis_not_running() {
! is_redis_running
! is_redis_running "$@"
}
########################

View File

@ -32,6 +32,7 @@ redis_cluster_env_vars=(
REDIS_REPLICATION_MODE
REDIS_REPLICA_IP
REDIS_REPLICA_PORT
REDIS_EXTRA_FLAGS
ALLOW_EMPTY_PASSWORD
REDIS_PASSWORD
REDIS_MASTER_PASSWORD
@ -96,6 +97,7 @@ export REDIS_ALLOW_REMOTE_CONNECTIONS="${REDIS_ALLOW_REMOTE_CONNECTIONS:-yes}"
export REDIS_REPLICATION_MODE="${REDIS_REPLICATION_MODE:-}"
export REDIS_REPLICA_IP="${REDIS_REPLICA_IP:-}"
export REDIS_REPLICA_PORT="${REDIS_REPLICA_PORT:-}"
export REDIS_EXTRA_FLAGS="${REDIS_EXTRA_FLAGS:-}"
export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
export REDIS_PASSWORD="${REDIS_PASSWORD:-}"
export REDIS_MASTER_PASSWORD="${REDIS_MASTER_PASSWORD:-}"

View File

@ -42,7 +42,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
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/).
* [`6.2`, `6.2-debian-10`, `6.2.5`, `6.2.5-debian-10-r42`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-cluster/blob/6.2.5-debian-10-r42/6.2/debian-10/Dockerfile)
* [`6.2`, `6.2-debian-10`, `6.2.5`, `6.2.5-debian-10-r43`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-cluster/blob/6.2.5-debian-10-r43/6.2/debian-10/Dockerfile)
* [`6.0`, `6.0-debian-10`, `6.0.15`, `6.0.15-debian-10-r46` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-cluster/blob/6.0.15-debian-10-r46/6.0/debian-10/Dockerfile)
* [`5.0`, `5.0-debian-10`, `5.0.13`, `5.0.13-debian-10-r47` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-cluster/blob/5.0.13-debian-10-r47/5.0/debian-10/Dockerfile)