diff --git a/bitnami/cassandra/5.0/debian-12/Dockerfile b/bitnami/cassandra/5.0/debian-12/Dockerfile index 8d85602a0af4..0eb767246adb 100644 --- a/bitnami/cassandra/5.0/debian-12/Dockerfile +++ b/bitnami/cassandra/5.0/debian-12/Dockerfile @@ -3,12 +3,12 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-03T14:43:46Z" \ + org.opencontainers.image.created="2026-06-11T00:51:36Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cassandra/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \ @@ -29,13 +29,13 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "python-3.11.15-13-linux-${OS_ARCH}-debian-12" \ + "python-3.11.15-15-linux-${OS_ARCH}-debian-12" \ "jre-11.0.31-11-1-linux-${OS_ARCH}-debian-12" \ "cassandra-5.0.8-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ fi ; \ sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/cassandra/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="5.0.8" \ BITNAMI_APP_NAME="cassandra" \ - IMAGE_REVISION="5" \ + IMAGE_REVISION="6" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/cassandra/bin:$PATH" diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 1bbed0bc25d3..000000000000 --- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -6fb6f7b48255c8479886c09b56e8a020692a6c95cdb6d53f0ddb2f80c0e58835 python-3.11.15-13-linux-amd64-debian-12.tar.gz diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 87b4759140ae..000000000000 --- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-13-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -9803219b1922af24dedb411b93aab649a14229925e6f8bbbfa0729107d96d8b7 python-3.11.15-13-linux-arm64-debian-12.tar.gz diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..bda8dd4d9ee5 --- /dev/null +++ b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +37c99da069b5fe3a65a87faba8e81093def8f71fcb63de181ab7f5a1b4a01a97 python-3.11.15-15-linux-amd64-debian-12.tar.gz diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5ceb6a92d424 --- /dev/null +++ b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/checksums/python-3.11.15-15-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +71fc7fb5b14e5e28277e7ff26ed39d8dd287fda0aa0e280187fefcbaadd37e62 python-3.11.15-15-linux-arm64-debian-12.tar.gz diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/cassandra/5.0/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 +}