diff --git a/bitnami/spark/3.2/debian-11/Dockerfile b/bitnami/spark/3.2/debian-11/Dockerfile index ffdcea34660e..143471ebafad 100644 --- a/bitnami/spark/3.2/debian-11/Dockerfile +++ b/bitnami/spark/3.2/debian-11/Dockerfile @@ -11,8 +11,8 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbz2-1.0 libc6 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-153" --checksum c33962b71ef103d071804f57720a34bada903c9a9bec1fbeddf57e97a5bd6279 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.333-153" --checksum 7ce94aacf3e51f137d94316b7767e590e7f827c0268f0d5336fd65cc7192aae8 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-154" --checksum c5a4c246e2373d5f2ecc2c08fca804c7551366c8a2a00f66b185bcc5c759b81e +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.342-0" --checksum 8f73ab6158f088f418caafcb5fd9981cf53076f38d8f9aba49acbcbadd6ac8da RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spark" "3.2.2-0" --checksum 64c8b90b6533a7fa773cbe210012fcda521ba11bdd17380d43d31ca5e4ca6ecc RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-152" --checksum 0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0 RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0ccdb2907b7b..dbf4a82bc360 100644 --- a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,17 +8,17 @@ }, "java": { "arch": "amd64", - "digest": "7ce94aacf3e51f137d94316b7767e590e7f827c0268f0d5336fd65cc7192aae8", + "digest": "8f73ab6158f088f418caafcb5fd9981cf53076f38d8f9aba49acbcbadd6ac8da", "distro": "debian-11", "type": "NAMI", - "version": "1.8.333-153" + "version": "1.8.342-0" }, "python": { "arch": "amd64", - "digest": "c33962b71ef103d071804f57720a34bada903c9a9bec1fbeddf57e97a5bd6279", + "digest": "c5a4c246e2373d5f2ecc2c08fca804c7551366c8a2a00f66b185bcc5c759b81e", "distro": "debian-11", "type": "NAMI", - "version": "3.8.13-153" + "version": "3.8.13-154" }, "spark": { "arch": "amd64", diff --git a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/libspark.sh b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/libspark.sh index 4f40a203c2c1..840effb7a1fb 100644 --- a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/libspark.sh +++ b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/libspark.sh @@ -64,6 +64,9 @@ export SPARK_METRICS_ENABLED="${SPARK_METRICS_ENABLED:-false}" # System Users export SPARK_DAEMON_USER="spark" export SPARK_DAEMON_GROUP="spark" + +# Paths +export SPARK_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" EOF } @@ -356,3 +359,39 @@ spark_initialize() { info "Detected mounted configuration file..." fi } + +######################## +# Run custom initialization scripts +# Globals: +# SPARK_* +# Arguments: +# None +# Returns: +# None +######################### +spark_custom_init_scripts() { + if [[ -n $(find "${SPARK_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh") ]]; then + info "Loading user's custom files from $SPARK_INITSCRIPTS_DIR ..." + local -r tmp_file="/tmp/filelist" + find "${SPARK_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh" | sort >"$tmp_file" + while read -r f; do + case "$f" in + *.sh) + if [[ -x "$f" ]]; then + debug "Executing $f" + "$f" + else + debug "Sourcing $f" + . "$f" + fi + ;; + *) + debug "Ignoring $f" + ;; + esac + done <$tmp_file + rm -f "$tmp_file" + else + info "No custom scripts in $SPARK_INITSCRIPTS_DIR" + fi +} diff --git a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/setup.sh b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/setup.sh index f81d8937389d..cc67f6a7b420 100755 --- a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/setup.sh +++ b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/setup.sh @@ -23,3 +23,6 @@ am_i_root && ensure_user_exists "$SPARK_DAEMON_USER" --group "$SPARK_DAEMON_GROU # Ensure Spark is initialized spark_initialize + +# Run custom initialization scripts +spark_custom_init_scripts \ No newline at end of file diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index f6a5668a3f96..02a2d7e0b573 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -44,7 +44,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.3`, `3.3-debian-11`, `3.3.0`, `3.3.0-debian-11-r9`, `latest` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.3.0-debian-11-r9/3.3/debian-11/Dockerfile) -* [`3.2`, `3.2-debian-11`, `3.2.2`, `3.2.2-debian-11-r1` (3.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.2.2-debian-11-r1/3.2/debian-11/Dockerfile) +* [`3.2`, `3.2-debian-11`, `3.2.2`, `3.2.2-debian-11-r2` (3.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.2.2-debian-11-r2/3.2/debian-11/Dockerfile) * [`3.1`, `3.1-debian-11`, `3.1.3`, `3.1.3-debian-11-r15` (3.1/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.1.3-debian-11-r15/3.1/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/spark GitHub repo](https://github.com/bitnami/bitnami-docker-spark).