From 41dd603b0fdb127af0e6d217b7823c72d73f45b6 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 11 Jun 2026 05:54:07 +0200 Subject: [PATCH] [bitnami/spark] Release 4.1.2-debian-12-r3 (#94711) Signed-off-by: Bitnami Bot --- bitnami/spark/4.1/debian-12/Dockerfile | 12 +++---- ....13-11-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....13-11-linux-arm64-debian-12.tar.gz.sha256 | 1 - ....13-13-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....13-13-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 2 +- .../opt/bitnami/scripts/libversion.sh | 33 +++++++++++++++++++ 8 files changed, 43 insertions(+), 10 deletions(-) delete mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/spark/4.1/debian-12/Dockerfile b/bitnami/spark/4.1/debian-12/Dockerfile index 5cedfdbf378b..91a2bccfc0db 100644 --- a/bitnami/spark/4.1/debian-12/Dockerfile +++ b/bitnami/spark/4.1/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-01T09:55:53Z" \ + org.opencontainers.image.created="2026-06-11T02:56:41Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/spark/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \ @@ -31,13 +31,13 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \ - "python-3.12.13-11-linux-${OS_ARCH}-debian-12" \ + "python-3.12.13-13-linux-${OS_ARCH}-debian-12" \ "jre-17.0.19-11-1-linux-${OS_ARCH}-debian-12" \ "spark-4.1.2-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 ; \ @@ -56,9 +56,9 @@ RUN /opt/bitnami/scripts/spark/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="4.1.2" \ BITNAMI_APP_NAME="spark" \ - IMAGE_REVISION="2" \ + IMAGE_REVISION="3" \ JAVA_HOME="/opt/bitnami/java" \ - LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/spark/venv/lib/python3.12/site-packages/numpy.libs:$LD_LIBRARY_PATH" \ + LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/spark/venv/lib/python3.12/site-packages/numpy.libs" \ LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \ NSS_WRAPPER_GROUP="/opt/bitnami/spark/tmp/nss_group" \ NSS_WRAPPER_PASSWD="/opt/bitnami/spark/tmp/nss_passwd" \ diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index d8d64cc5e94a..000000000000 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -a13e9f6ab18a719682fd94b0bdd131a771835c8cb707e2451c472a8b6927f3f7 python-3.12.13-11-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 694ac13e1718..000000000000 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-11-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -f79c0e2b0c9179091f9b06c650c757680b91a9f655538e85968cce732f150ab6 python-3.12.13-11-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..4ff3895f736b --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +8afa744c834281aff341ab8a81038d14d00bbf1cee2f18bcb9923a924e5b181c python-3.12.13-13-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..7f335ed3490b --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +ba98326cbd33411e59332e84fb6d65749d1951d74452b0525d1c7861cf0eb9f2 python-3.12.13-13-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/spark/4.1/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/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/spark/4.1/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/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/spark/4.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 +}