diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile index c8147eb5b36a..c541270ba7fc 100644 --- a/bitnami/spark/3.3/debian-11/Dockerfile +++ b/bitnami/spark/3.3/debian-11/Dockerfile @@ -5,7 +5,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="3.3.0-debian-11-r32" \ + org.opencontainers.image.ref.name="3.3.0-debian-11-r33" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -20,7 +20,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages 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 install_packages ca-certificates curl 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 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f python-3.8.14-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.14-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ diff --git a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh index f6718e15811d..eebd41c70a58 100755 --- a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh +++ b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh @@ -41,6 +41,25 @@ case "$1" in "$@" ) ;; + executor) + shift 1 + CMD=( + ${JAVA_HOME}/bin/java + "${SPARK_EXECUTOR_JAVA_OPTS[@]}" + -Xms$SPARK_EXECUTOR_MEMORY + -Xmx$SPARK_EXECUTOR_MEMORY + -cp '/opt/bitnami/spark/conf::/opt/bitnami/spark/jars/*' + org.apache.spark.scheduler.cluster.k8s.KubernetesExecutorBackend + --driver-url $SPARK_DRIVER_URL + --executor-id $SPARK_EXECUTOR_ID + --cores $SPARK_EXECUTOR_CORES + --app-id $SPARK_APPLICATION_ID + --hostname $SPARK_EXECUTOR_POD_IP + --resourceProfileId $SPARK_RESOURCE_PROFILE_ID + --podName $SPARK_EXECUTOR_POD_NAME + ) + ;; + *) # Non-spark-on-k8s command provided, proceeding in pass-through mode CMD=("$@") diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index a48ca82745ed..de51d06d3605 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`3.3`, `3.3-debian-11`, `3.3.0`, `3.3.0-debian-11-r32`, `latest` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.3/debian-11/Dockerfile) +* [`3.3`, `3.3-debian-11`, `3.3.0`, `3.3.0-debian-11-r33`, `latest` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.3/debian-11/Dockerfile) * [`3.2`, `3.2-debian-11`, `3.2.2`, `3.2.2-debian-11-r22` (3.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.2/debian-11/Dockerfile) * [`3.1`, `3.1-debian-11`, `3.1.3`, `3.1.3-debian-11-r36` (3.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.1/debian-11/Dockerfile)