From 48a0171def1166fdf90f2eb3a7eb90ee371cd07d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 7 Sep 2022 21:37:44 +0200 Subject: [PATCH] [bitnami/redis-cluster] Release 7.0.4-debian-11-r13 (#5498) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../redis-cluster/7.0/debian-11/Dockerfile | 35 +++++++++++-------- .../opt/bitnami/scripts/librediscluster.sh | 1 - bitnami/redis-cluster/README.md | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile index aeacf5a828ad..3b62a4a5c00a 100644 --- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.0/debian-11/Dockerfile @@ -1,35 +1,40 @@ FROM docker.io/bitnami/minideb:bullseye -ENV HOME="/" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" + +ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="7.0.4-debian-11-r12" \ + org.opencontainers.image.ref.name="7.0.4-debian-11-r13" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/redis-cluster" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.4" +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libssl1.1 procps tar RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f redis-7.0.4-3-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/redis-7.0.4-3-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "88d418ff4ced6262a27a1ea18294e410110dc8c4ad5449d3ae7d6fa9e087b6ba redis-7.0.4-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf redis-7.0.4-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf redis-7.0.4-3-linux-amd64-debian-11.tar.gz + sha256sum -c redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf redis-7.0.4-3-linux-${OS_ARCH}-debian-11.tar.gz RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz + sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh index 890b47253eb3..acff6859d394 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh @@ -190,7 +190,6 @@ redis_cluster_check() { ######################### redis_cluster_update_ips() { read -ra nodes <<< "$(tr ',;' ' ' <<< "${REDIS_NODES}")" - declare -A host_2_ip_array # Array to map hosts and IPs # Update the IPs when a number of nodes > quorum change their IPs if [[ ! -f "${REDIS_DATA_DIR}/nodes.sh" ]]; then diff --git a/bitnami/redis-cluster/README.md b/bitnami/redis-cluster/README.md index 108c416111c1..dac1121a2ff1 100644 --- a/bitnami/redis-cluster/README.md +++ b/bitnami/redis-cluster/README.md @@ -41,7 +41,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) 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/). -* [`7.0`, `7.0-debian-11`, `7.0.4`, `7.0.4-debian-11-r12`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/7.0/debian-11/Dockerfile) +* [`7.0`, `7.0-debian-11`, `7.0.4`, `7.0.4-debian-11-r13`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/7.0/debian-11/Dockerfile) * [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r28` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/6.2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).