From f57c6614a8c58a3930b8ea071c75ed9e01565bfd Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 4 Apr 2023 21:38:39 +0200
Subject: [PATCH] [bitnami/spark] Release 3.2.3-debian-11-r40 (#29308)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/spark/3.2/debian-11/Dockerfile              | 13 +++++++------
 bitnami/spark/3.2/debian-11/docker-compose.yml      |  2 ++
 .../prebuildfs/opt/bitnami/.bitnami_components.json |  6 +++---
 .../rootfs/opt/bitnami/scripts/spark-env.sh         |  1 +
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bitnami/spark/3.2/debian-11/Dockerfile b/bitnami/spark/3.2/debian-11/Dockerfile
index 90bb97ee04e6..dde1e49dcf9b 100644
--- a/bitnami/spark/3.2/debian-11/Dockerfile
+++ b/bitnami/spark/3.2/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-04-01T16:17:36Z" \
+      org.opencontainers.image.created="2023-04-04T18:52:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.2.3-debian-11-r39" \
+      org.opencontainers.image.ref.name="3.2.3-debian-11-r40" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.2.3"
@@ -24,9 +24,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 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/ && \
     COMPONENTS=( \
-      "python-3.8.16-9-linux-${OS_ARCH}-debian-11" \
-      "java-1.8.362-4-linux-${OS_ARCH}-debian-11" \
-      "spark-3.2.3-11-linux-${OS_ARCH}-debian-11" \
+      "python-3.9.16-9-linux-${OS_ARCH}-debian-11" \
+      "java-11.0.18-10-4-linux-${OS_ARCH}-debian-11" \
+      "spark-3.2.3-12-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -55,7 +55,8 @@ ENV APP_VERSION="3.2.3" \
     NSS_WRAPPER_GROUP="/opt/bitnami/spark/tmp/nss_group" \
     NSS_WRAPPER_PASSWD="/opt/bitnami/spark/tmp/nss_passwd" \
     PYTHONPATH="/opt/bitnami/spark/python/:$PYTHONPATH" \
-    SPARK_HOME="/opt/bitnami/spark"
+    SPARK_HOME="/opt/bitnami/spark" \
+    SPARK_USER="spark"
 
 WORKDIR /opt/bitnami/spark
 USER 1001
diff --git a/bitnami/spark/3.2/debian-11/docker-compose.yml b/bitnami/spark/3.2/debian-11/docker-compose.yml
index 722384e20d7d..969a5907e509 100644
--- a/bitnami/spark/3.2/debian-11/docker-compose.yml
+++ b/bitnami/spark/3.2/debian-11/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - SPARK_RPC_ENCRYPTION_ENABLED=no
       - SPARK_LOCAL_STORAGE_ENCRYPTION_ENABLED=no
       - SPARK_SSL_ENABLED=no
+      - SPARK_USER=spark
     ports:
       - '8080:8080'
   spark-worker:
@@ -22,3 +23,4 @@ services:
       - SPARK_RPC_ENCRYPTION_ENABLED=no
       - SPARK_LOCAL_STORAGE_ENCRYPTION_ENABLED=no
       - SPARK_SSL_ENABLED=no
+      - SPARK_USER=spark
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 17a3ccbf698b..4ce0b983908b 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
@@ -9,18 +9,18 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.8.362-4"
+        "version": "11.0.18-10-4"
     },
     "python": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.16-9"
+        "version": "3.9.16-9"
     },
     "spark": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.2.3-11"
+        "version": "3.2.3-12"
     }
 }
\ No newline at end of file
diff --git a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark-env.sh b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark-env.sh
index c64ac08dddd3..588f929ed353 100644
--- a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark-env.sh
+++ b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark-env.sh
@@ -62,6 +62,7 @@ export SPARK_LOG_DIR="${SPARK_BASE_DIR}/logs"
 export SPARK_TMP_DIR="${SPARK_BASE_DIR}/tmp"
 export SPARK_JARS_DIR="${SPARK_BASE_DIR}/jars"
 export SPARK_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
+export SPARK_USER="spark"
 
 # Spark configuration
 export SPARK_MODE="${SPARK_MODE:-master}"