From 5c71b862a5c7e9c08fa9c3b99f5f0a11e38c5eb7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 19:29:58 +0200 Subject: [PATCH] [bitnami/redis-cluster] Release 7.0.11-debian-11-r1 (#31120) Signed-off-by: Bitnami Containers --- .../redis-cluster/7.0/debian-11/Dockerfile | 10 +- .../opt/bitnami/.bitnami_components.json | 6 -- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libredis.sh | 4 +- .../opt/bitnami/scripts/redis-cluster/run.sh | 4 +- 5 files changed, 104 insertions(+), 15 deletions(-) diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile index d762c7110c17..cd0b36491cc2 100644 --- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.0/debian-11/Dockerfile @@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-17T16:50:06Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-04-20T17:14:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.11-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.11-debian-11-r1" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.11" @@ -23,7 +24,6 @@ RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "redis-7.0.11-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,7 +43,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/redis-cluster/postunpack.sh ENV APP_VERSION="7.0.11" \ BITNAMI_APP_NAME="redis-cluster" \ - PATH="/opt/bitnami/redis/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/redis/bin:$PATH" EXPOSE 6379 diff --git a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cfcf8cff96df..011f106c7d21 100644 --- a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,4 @@ { - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "redis": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -553,3 +553,98 @@ get_root_disk_device_id() { get_root_disk_size() { fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true } + +######################## +# Run command as a specific user and group (optional) +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +run_as_user() { + run_chroot "$@" +} + +######################## +# Execute command as a specific user and group (optional), +# replacing the current process image +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +exec_as_user() { + run_chroot --replace-process "$@" +} + +######################## +# Run a command using chroot +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Flags: +# -r | --replace-process - Replace the current process image (optional) +# Returns: +# Exit code of the specified command +######################### +run_chroot() { + local userspec + local user + local homedir + local replace=false + local -r cwd="$(pwd)" + + # Parse and validate flags + while [[ "$#" -gt 0 ]]; do + case "$1" in + -r | --replace-process) + replace=true + ;; + --) + shift + break + ;; + -*) + stderr_print "unrecognized flag $1" + return 1 + ;; + *) + break + ;; + esac + shift + done + + # Parse and validate arguments + if [[ "$#" -lt 2 ]]; then + echo "expected at least 2 arguments" + return 1 + else + userspec=$1 + shift + + # userspec can optionally include the group, so we parse the user + user=$(echo "$userspec" | cut -d':' -f1) + fi + + if ! am_i_root; then + error "Could not switch to '${userspec}': Operation not permitted" + return 1 + fi + + # Get the HOME directory for the user to switch, as chroot does + # not properly update this env and some scripts rely on it + homedir=$(eval echo "~${user}") + if [[ ! -d $homedir ]]; then + homedir="${HOME:-/}" + fi + + # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion + if [[ "$replace" = true ]]; then + exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + else + chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + fi +} \ No newline at end of file diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index 976b056b17bc..ec3d1d175ca2 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -57,7 +57,7 @@ redis_conf_set() { # Determine whether to enable the configuration for RDB persistence, if yes, do not enable the replacement operation if [ "${key}" == "save" ];then echo "${key} ${value}" >> "${REDIS_BASE_DIR}/etc/redis.conf" - else + else replace_in_file "${REDIS_BASE_DIR}/etc/redis.conf" "^#*\s*${key} .*" "${key} ${value}" false fi } @@ -159,7 +159,7 @@ redis_stop() { debug "Stopping Redis" if am_i_root; then - gosu "$REDIS_DAEMON_USER" "${REDIS_BASE_DIR}/bin/redis-cli" "${args[@]}" shutdown + run_as_user "$REDIS_DAEMON_USER" "${REDIS_BASE_DIR}/bin/redis-cli" "${args[@]}" shutdown else "${REDIS_BASE_DIR}/bin/redis-cli" "${args[@]}" shutdown fi diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/run.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/run.sh index 89fd71997ab6..803d032ca6d0 100755 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/run.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/run.sh @@ -35,7 +35,7 @@ ARGS+=("$@") if is_boolean_yes "$REDIS_CLUSTER_CREATOR" && ! [[ -f "${REDIS_DATA_DIR}/nodes.conf" ]]; then # Start Redis in background if am_i_root; then - gosu "$REDIS_DAEMON_USER" redis-server "${ARGS[@]}" & + run_as_user "$REDIS_DAEMON_USER" redis-server "${ARGS[@]}" & else redis-server "${ARGS[@]}" & fi @@ -45,7 +45,7 @@ if is_boolean_yes "$REDIS_CLUSTER_CREATOR" && ! [[ -f "${REDIS_DATA_DIR}/nodes.c fg else if am_i_root; then - exec gosu "$REDIS_DAEMON_USER" redis-server "${ARGS[@]}" + exec_as_user "$REDIS_DAEMON_USER" redis-server "${ARGS[@]}" else exec redis-server "${ARGS[@]}" fi