From 84a69ed2b86dd6d9c72bbbe35bd402010d21674e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 18 Jun 2026 20:25:38 +0200 Subject: [PATCH] [bitnami/spark] Release 4.1.2-debian-12-r4 (#94877) Signed-off-by: Bitnami Bot --- bitnami/spark/4.1/debian-12/Dockerfile | 6 +++--- ...thon-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 | 1 - ...thon-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 | 1 - ...thon-3.12.13-15-linux-amd64-debian-12.tar.gz.sha256 | 1 + ...thon-3.12.13-15-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libpersistence.sh | 10 +++++----- .../debian-12/rootfs/opt/bitnami/scripts/libspark.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/spark-env.sh | 4 ++++ bitnami/spark/README.md | 2 ++ 9 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-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 91a2bccfc0db..25bb3d64b9ca 100644 --- a/bitnami/spark/4.1/debian-12/Dockerfile +++ b/bitnami/spark/4.1/debian-12/Dockerfile @@ -8,7 +8,7 @@ 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-11T02:56:41Z" \ + org.opencontainers.image.created="2026-06-18T17:35:37Z" \ 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,7 +31,7 @@ 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-13-linux-${OS_ARCH}-debian-12" \ + "python-3.12.13-15-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" \ ) ; \ @@ -56,7 +56,7 @@ 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="3" \ + IMAGE_REVISION="4" \ JAVA_HOME="/opt/bitnami/java" \ 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" \ 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 deleted file mode 100644 index 4ff3895f736b..000000000000 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 7f335ed3490b..000000000000 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-13-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -ba98326cbd33411e59332e84fb6d65749d1951d74452b0525d1c7861cf0eb9f2 python-3.12.13-13-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e6e055dcbb52 --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +69357adf12b47d2a68b570f2b552716ce10fc4e7a5cf9a088a5f65df35be3419 python-3.12.13-15-linux-amd64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..05d39d17146e --- /dev/null +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/checksums/python-3.12.13-15-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +9344da31ca83ea8559ea5d6e0b174a66976e8ad66ed9f3d1e6544356d319595a python-3.12.13-15-linux-arm64-debian-12.tar.gz diff --git a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 18445e7d27fa..833ee5ab1d65 100644 --- a/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/spark/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -39,7 +39,7 @@ persist_app() { fi pushd "$install_dir" >/dev/null || exit local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder - local -r tmp_file="/tmp/perms.acl" + local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)" for file_to_persist in "${files_to_persist[@]}"; do if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then error "Cannot persist '${file_to_persist}' because it does not exist" @@ -50,22 +50,22 @@ persist_app() { file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" # Get original permissions for existing files, which will be applied later # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume - getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" + getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file" # Copy directories to the volume ensure_dir_exists "$file_to_persist_destination_folder" cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" # Restore permissions pushd "$persist_dir" >/dev/null || exit if am_i_root; then - setfacl --restore="$tmp_file" + setfacl --restore="$acl_file" else # When running as non-root, don't change ownership - setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file") fi popd >/dev/null || exit done popd >/dev/null || exit - rm -f "$tmp_file" + rm -f "$acl_file" # Install the persisted files into the installation directory, via symlinks restore_persisted_app "$@" } diff --git a/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh index c7cf39857cf3..3791f06188b6 100644 --- a/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh +++ b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/libspark.sh @@ -188,14 +188,14 @@ spark_enable_ssl() { spark_conf_set spark.ssl.keyPassword "${SPARK_SSL_KEY_PASSWORD}" spark_conf_set spark.ssl.keyStore "${SPARK_SSL_KEYSTORE_FILE}" spark_conf_set spark.ssl.keyStorePassword "${SPARK_SSL_KEYSTORE_PASSWORD}" - spark_conf_set spark.ssl.keyStoreType "JKS" + spark_conf_set spark.ssl.keyStoreType "${SPARK_SSL_KEYSTORE_TYPE}" spark_conf_set spark.ssl.protocol "${SPARK_SSL_PROTOCOL}" if is_boolean_yes "$SPARK_SSL_NEED_CLIENT_AUTH"; then spark_conf_set spark.ssl.needClientAuth "true" fi spark_conf_set spark.ssl.trustStore "${SPARK_SSL_TRUSTSTORE_FILE}" spark_conf_set spark.ssl.trustStorePassword "${SPARK_SSL_TRUSTSTORE_PASSWORD}" - spark_conf_set spark.ssl.trustStoreType "JKS" + spark_conf_set spark.ssl.trustStoreType "${SPARK_SSL_TRUSTSTORE_TYPE}" } ######################## diff --git a/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh index 1b53e5678afa..f68278736570 100644 --- a/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh +++ b/bitnami/spark/4.1/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh @@ -35,8 +35,10 @@ spark_env_vars=( SPARK_SSL_KEY_PASSWORD SPARK_SSL_KEYSTORE_PASSWORD SPARK_SSL_KEYSTORE_FILE + SPARK_SSL_KEYSTORE_TYPE SPARK_SSL_TRUSTSTORE_PASSWORD SPARK_SSL_TRUSTSTORE_FILE + SPARK_SSL_TRUSTSTORE_TYPE SPARK_SSL_NEED_CLIENT_AUTH SPARK_SSL_PROTOCOL SPARK_WEBUI_SSL_PORT @@ -85,8 +87,10 @@ export SPARK_SSL_ENABLED="${SPARK_SSL_ENABLED:-no}" export SPARK_SSL_KEY_PASSWORD="${SPARK_SSL_KEY_PASSWORD:-}" export SPARK_SSL_KEYSTORE_PASSWORD="${SPARK_SSL_KEYSTORE_PASSWORD:-}" export SPARK_SSL_KEYSTORE_FILE="${SPARK_SSL_KEYSTORE_FILE:-${SPARK_CONF_DIR}/certs/spark-keystore.jks}" +export SPARK_SSL_KEYSTORE_TYPE="${SPARK_SSL_KEYSTORE_TYPE:-JKS}" export SPARK_SSL_TRUSTSTORE_PASSWORD="${SPARK_SSL_TRUSTSTORE_PASSWORD:-}" export SPARK_SSL_TRUSTSTORE_FILE="${SPARK_SSL_TRUSTSTORE_FILE:-${SPARK_CONF_DIR}/certs/spark-truststore.jks}" +export SPARK_SSL_TRUSTSTORE_TYPE="${SPARK_SSL_TRUSTSTORE_TYPE:-JKS}" export SPARK_SSL_NEED_CLIENT_AUTH="${SPARK_SSL_NEED_CLIENT_AUTH:-yes}" export SPARK_SSL_PROTOCOL="${SPARK_SSL_PROTOCOL:-TLSv1.2}" export SPARK_WEBUI_SSL_PORT="${SPARK_WEBUI_SSL_PORT:-}" diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 221d59ca5a95..89e2ed56d8e2 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -75,8 +75,10 @@ The following tables list the main variables you can set. | `SPARK_SSL_KEY_PASSWORD` | The password to the private key in the key store. | `nil` | | `SPARK_SSL_KEYSTORE_PASSWORD` | The password for the key store. | `nil` | | `SPARK_SSL_KEYSTORE_FILE` | Location of the key store. | `${SPARK_CONF_DIR}/certs/spark-keystore.jks` | +| `SPARK_SSL_KEYSTORE_TYPE` | The type of the key store. | `JKS` | | `SPARK_SSL_TRUSTSTORE_PASSWORD` | The password for the trust store. | `nil` | | `SPARK_SSL_TRUSTSTORE_FILE` | Location of the key store. | `${SPARK_CONF_DIR}/certs/spark-truststore.jks` | +| `SPARK_SSL_TRUSTSTORE_TYPE` | The type of the trust store. | `JKS` | | `SPARK_SSL_NEED_CLIENT_AUTH` | Whether to require client authentication. | `yes` | | `SPARK_SSL_PROTOCOL` | TLS protocol to use. | `TLSv1.2` | | `SPARK_WEBUI_SSL_PORT` | Spark management server port number for SSL/TLS connections. | `nil` |