diff --git a/bitnami/spark/3.5/debian-12/Dockerfile b/bitnami/spark/3.5/debian-12/Dockerfile index edc10d3de77b..c6de138fc231 100644 --- a/bitnami/spark/3.5/debian-12/Dockerfile +++ b/bitnami/spark/3.5/debian-12/Dockerfile @@ -9,15 +9,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-02-20T15:03:32Z" \ + org.opencontainers.image.created="2025-02-27T21:15:19Z" \ 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.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.4-debian-12-r6" \ + org.opencontainers.image.ref.name="3.5.5-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="3.5.4" + org.opencontainers.image.version="3.5.5" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -31,9 +31,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl3 libstdc++6 libtinfo6 libtirpc3 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.12.9-3-linux-${OS_ARCH}-debian-12" \ + "python-3.12.9-5-linux-${OS_ARCH}-debian-12" \ "jre-17.0.14-10-1-linux-${OS_ARCH}-debian-12" \ - "spark-3.5.4-1-linux-${OS_ARCH}-debian-12" \ + "spark-3.5.5-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -54,7 +54,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/spark/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="3.5.4" \ +ENV APP_VERSION="3.5.5" \ BITNAMI_APP_NAME="spark" \ 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" \ diff --git a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 48ae3835b741..6c5a7a51e4a0 100644 --- a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.12.9-3" + "version": "3.12.9-5" }, "spark": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.5.4-1" + "version": "3.5.5-0" } } \ No newline at end of file diff --git a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh index 450f05bd823f..1e18ef9866fa 100644 --- a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -39,7 +39,14 @@ stderr_print() { # None ######################### log() { - stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]]; then + stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" + else + stderr_print "${MODULE:-} $(date "+%T.%2N ")${*}" + fi } ######################## # Log an 'info' message @@ -49,7 +56,14 @@ log() { # None ######################### info() { - log "${GREEN}INFO ${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$GREEN" + fi + log "${msg_color}INFO ${RESET} ==> ${*}" } ######################## # Log message @@ -59,7 +73,14 @@ info() { # None ######################### warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$YELLOW" + fi + log "${msg_color}WARN ${RESET} ==> ${*}" } ######################## # Log an 'error' message @@ -69,7 +90,14 @@ warn() { # None ######################### error() { - log "${RED}ERROR${RESET} ==> ${*}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]];then + msg_color="$RED" + fi + log "${msg_color}ERROR${RESET} ==> ${*}" } ######################## # Log a 'debug' message @@ -81,12 +109,16 @@ error() { # None ######################### debug() { - # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it - local bool="${BITNAMI_DEBUG:-false}" + local msg_color="" + local color_bool="${BITNAMI_COLOR:-true}" # comparison is performed without regard to the case of alphabetic characters shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - log "${MAGENTA}DEBUG${RESET} ==> ${*}" + if [[ "$color_bool" = 1 || "$color_bool" =~ ^(yes|true)$ ]] ;then + msg_color="$MAGENTA" + fi + local debug_bool="${BITNAMI_DEBUG:-false}" + if [[ "$debug_bool" = 1 || "$debug_bool" =~ ^(yes|true)$ ]]; then + log "${msg_color}DEBUG${RESET} ==> ${*}" fi } diff --git a/bitnami/spark/3.5/debian-12/tags-info.yaml b/bitnami/spark/3.5/debian-12/tags-info.yaml index 7ffffb4281d6..838173a935e7 100644 --- a/bitnami/spark/3.5/debian-12/tags-info.yaml +++ b/bitnami/spark/3.5/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3.5" - 3.5-debian-12 -- 3.5.4 +- 3.5.5 - latest