diff --git a/bitnami/valkey-cluster/9.1/debian-12/Dockerfile b/bitnami/valkey-cluster/9.1/debian-12/Dockerfile index 2cb149d2d655..bedb2b4208be 100644 --- a/bitnami/valkey-cluster/9.1/debian-12/Dockerfile +++ b/bitnami/valkey-cluster/9.1/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-05T11:43:43Z" \ + org.opencontainers.image.created="2026-06-05T16:02:00Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/valkey-cluster/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/valkey-cluster" \ @@ -50,7 +50,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/valkey-cluster/postunpack.sh ENV APP_VERSION="9.1.0" \ BITNAMI_APP_NAME="valkey-cluster" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="5" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/valkey/bin:$PATH" EXPOSE 6379 diff --git a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/valkey-cluster/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +} diff --git a/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh index 5808cd2779cf..2c6fb353a750 100755 --- a/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh +++ b/bitnami/valkey-cluster/9.1/debian-12/rootfs/opt/bitnami/scripts/valkey-cluster/run.sh @@ -26,10 +26,10 @@ args=("--port" "$VALKEY_PORT_NUMBER" "--include" "${VALKEY_BASE_DIR}/etc/valkey. if ! is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then if [[ -w "${VALKEY_BASE_DIR}/etc/valkey.conf" ]]; then valkey_conf_set requirepass "$VALKEY_PASSWORD" - valkey_conf_set masterauth "$VALKEY_PASSWORD" + valkey_conf_set primaryauth "$VALKEY_PASSWORD" else args+=("--requirepass" "$VALKEY_PASSWORD") - args+=("--masterauth" "$VALKEY_PASSWORD") + args+=("--primaryauth" "$VALKEY_PASSWORD") fi else args+=("--protected-mode" "no")