[bitnami/redis-cluster] Release 6.2.11-debian-11-r5 (#27715)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-03-19 01:53:51 +01:00
committed by GitHub
parent 23d878acac
commit b85cdf55a9
6 changed files with 60 additions and 18 deletions
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-03-12T21:40:47Z" \
org.opencontainers.image.created="2023-03-19T00:05:03Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="6.2.11-debian-11-r4" \
org.opencontainers.image.ref.name="6.2.11-debian-11-r5" \
org.opencontainers.image.title="redis-cluster" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="6.2.11"
@@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl libssl1.1 procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"redis-6.2.11-0-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
"redis-6.2.11-1-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -1,16 +1,16 @@
{
"gosu": {
"arch": "amd64",
"digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
"digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-2"
"version": "1.16.0-3"
},
"redis": {
"arch": "amd64",
"digest": "52e4b1c27e450f58b2a9924f916c7768001d3a4b93c73d9efe0658b30c8f5d1c",
"digest": "ff506b68ee6606dba9952a54ab6c212cb974864d3c1616a46687d8643b12740d",
"distro": "debian-11",
"type": "NAMI",
"version": "6.2.11-0"
"version": "6.2.11-1"
}
}
@@ -281,6 +281,8 @@ remove_logrotate_conf() {
# --environment - Environment variable to define (multiple --environment options may be passed)
# --environment-file - Text file with environment variables
# --exec-start - Start command (required)
# --exec-start-pre - Pre-start command (optional)
# --exec-start-post - Post-start command (optional)
# --exec-stop - Stop command (optional)
# --exec-reload - Reload command (optional)
# --group - System group to start the service with
@@ -292,6 +294,7 @@ remove_logrotate_conf() {
# --success-exit-status - Exit code that indicates a successful shutdown
# --type - Systemd unit type (defaults to forking)
# --user - System user to start the service with
# --working-directory - Working directory at which to start the service
# Returns:
# None
#########################
@@ -307,6 +310,8 @@ generate_systemd_conf() {
local environment=""
local environment_file=""
local exec_start=""
local exec_start_pre=""
local exec_start_post=""
local exec_stop=""
local exec_reload=""
local restart="always"
@@ -316,6 +321,7 @@ generate_systemd_conf() {
local limits_content=""
local success_exit_status=""
local custom_service_content=""
local working_directory=""
# Parse CLI flags
shift
while [[ "$#" -gt 0 ]]; do
@@ -334,6 +340,7 @@ generate_systemd_conf() {
| --standard-error \
| --success-exit-status \
| --custom-service-content \
| --working-directory \
)
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
shift
@@ -345,11 +352,21 @@ generate_systemd_conf() {
shift
limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
;;
--exec-start-pre)
shift
[[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n'
exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}"
;;
--exec-start-post)
shift
[[ -n "$exec_start_post" ]] && exec_start_post+=$'\n'
exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}"
;;
--environment)
shift
# It is possible to add multiple environment lines
[[ -n "$environment" ]] && environment+=$'\n'
environment+="Environment=${1:?"environment" is missing}"
environment+="Environment=${1:?"--environment value is missing"}"
;;
*)
echo "Invalid command line flag ${1}" >&2
@@ -376,8 +393,21 @@ PartOf=bitnami.service
[Service]
Type=${type}
ExecStart=${exec_start}
EOF
if [[ -n "$working_directory" ]]; then
cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
fi
if [[ -n "$exec_start_pre" ]]; then
# This variable may contain multiple ExecStartPre= directives
cat >> "$service_file" <<< "$exec_start_pre"
fi
if [[ -n "$exec_start" ]]; then
cat >> "$service_file" <<< "ExecStart=${exec_start}"
fi
if [[ -n "$exec_start_post" ]]; then
# This variable may contain multiple ExecStartPost= directives
cat >> "$service_file" <<< "$exec_start_post"
fi
# Optional stop and reload commands
if [[ -n "$exec_stop" ]]; then
cat >> "$service_file" <<< "ExecStop=${exec_stop}"
@@ -399,8 +429,9 @@ EOF
if [[ -n "$restart" ]]; then
cat >> "$service_file" <<< "Restart=${restart}"
fi
# Environment flags (may be specified multiple times in a unit)
# Environment flags
if [[ -n "$environment" ]]; then
# This variable may contain multiple Environment= directives
cat >> "$service_file" <<< "$environment"
fi
if [[ -n "$environment_file" ]]; then
@@ -414,6 +445,7 @@ EOF
cat >> "$service_file" <<< "StandardError=${standard_error}"
fi
if [[ -n "$custom_service_content" ]]; then
# This variable may contain multiple miscellaneous directives
cat >> "$service_file" <<< "$custom_service_content"
fi
if [[ -n "$success_exit_status" ]]; then
@@ -424,7 +456,8 @@ EOF
fi
cat >> "$service_file" <<EOF
# Optimizations
TimeoutSec=5min
TimeoutStartSec=2min
TimeoutStopSec=30s
IgnoreSIGPIPE=no
KillMode=mixed
EOF
@@ -87,6 +87,12 @@ redis_cluster_override_conf() {
# Always set the announce-ip to avoid issues when using proxies and traffic restrictions.
redis_conf_set cluster-announce-ip "$(get_machine_ip)"
fi
if ! is_empty_value "$REDIS_CLUSTER_ANNOUNCE_HOSTNAME"; then
redis_conf_set "cluster-announce-hostname" "$REDIS_CLUSTER_ANNOUNCE_HOSTNAME"
fi
if ! is_empty_value "$REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE"; then
redis_conf_set "cluster-preferred-endpoint-type" "$REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE"
fi
if is_boolean_yes "$REDIS_TLS_ENABLED"; then
redis_conf_set tls-cluster yes
redis_conf_set tls-replication yes
@@ -60,6 +60,8 @@ redis_cluster_env_vars=(
REDIS_CLUSTER_SLEEP_BEFORE_DNS_LOOKUP
REDIS_CLUSTER_DNS_LOOKUP_RETRIES
REDIS_CLUSTER_DNS_LOOKUP_SLEEP
REDIS_CLUSTER_ANNOUNCE_HOSTNAME
REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE
REDIS_TLS_PORT
)
for env_var in "${redis_cluster_env_vars[@]}"; do
@@ -137,5 +139,7 @@ export REDIS_NODES="${REDIS_NODES:-}"
export REDIS_CLUSTER_SLEEP_BEFORE_DNS_LOOKUP="${REDIS_CLUSTER_SLEEP_BEFORE_DNS_LOOKUP:-0}"
export REDIS_CLUSTER_DNS_LOOKUP_RETRIES="${REDIS_CLUSTER_DNS_LOOKUP_RETRIES:-1}"
export REDIS_CLUSTER_DNS_LOOKUP_SLEEP="${REDIS_CLUSTER_DNS_LOOKUP_SLEEP:-1}"
export REDIS_CLUSTER_ANNOUNCE_HOSTNAME="${REDIS_CLUSTER_ANNOUNCE_HOSTNAME:-}"
export REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE="${REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE:-ip}"
# Custom environment variables may be defined below
+5 -6
View File
@@ -5,7 +5,6 @@
> Redis&reg; is an open source, scalable, distributed in-memory cache for applications. It can be used to store and serve data in the form of strings, hashes, lists, sets and sorted sets.
[Overview of Redis&reg; Cluster](http://redis.io)
Disclaimer: Redis is a registered trademark of Redis Ltd. Any rights therein are reserved to Redis Ltd. Any use by Bitnami is for referential purposes only and does not indicate any sponsorship, endorsement, or affiliation between Redis Ltd.
## TL;DR
@@ -180,14 +179,14 @@ The following env vars are supported for this container:
| `REDIS_CLUSTER_CREATOR` | Set to `yes` if the container will be the one on charge of initialize the cluster. This node will also be part of the cluster. |
| `REDIS_CLUSTER_REPLICAS` | Number of replicas for every master that the cluster will have. |
| `REDIS_NODES` | String delimited by spaces containing the hostnames of all of the nodes that will be part of the cluster |
| `REDIS_CLUSTER_ANNOUNCE_IP` | IP that the node should announce, used for non dynamic ip environments |
| `REDIS_CLUSTER_ANNOUNCE_PORT` | Port that the node should announce, used for non dynamic ip environments. |
| `REDIS_CLUSTER_ANNOUNCE_HOSTNAME` | Hostname that node should announce, used for non dynamic ip environments. |
| `REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE` | Preferred endpoint type which cluster should use, options- ip, hostname|
| `REDIS_CLUSTER_ANNOUNCE_IP` | IP that the node should announce, used for non dynamic ip environments |
| `REDIS_CLUSTER_ANNOUNCE_PORT` | Port that the node should announce, used for non dynamic ip environments. |
| `REDIS_CLUSTER_ANNOUNCE_HOSTNAME` | Hostname that node should announce, used for non dynamic ip environments. |
| `REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE` | Preferred endpoint type which cluster should use, options- ip, hostname |
| `REDIS_CLUSTER_ANNOUNCE_BUS_PORT` | The cluster bus port to announce. |
| `REDIS_CLUSTER_DYNAMIC_IPS` | Set to `no` if your Redis(R) cluster will be created with statical IPs. Default: `yes` |
| `REDIS_TLS_ENABLED` | Whether to enable TLS for traffic or not. Defaults to `no`. |
| `REDIS_TLS_PORT_NUMBER` | Port used for TLS secure traffic. Defaults to `6379`. |
| `REDIS_TLS_PORT_NUMBER` | Port used for TLS secure traffic. Defaults to `6379`. |
| `REDIS_TLS_CERT_FILE` | File containing the certificate file for the TLS traffic. No defaults. |
| `REDIS_TLS_KEY_FILE` | File containing the key for certificate. No defaults. |
| `REDIS_TLS_CA_FILE` | File containing the CA of the certificate. No defaults. |