From 9da016e512cc93aeb42fd6bbccd735d07d157c2c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 2 Mar 2023 09:49:22 +0100
Subject: [PATCH] [bitnami/spark] Release 3.3.2-debian-11-r4 (#26030)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/spark/3.3/debian-11/Dockerfile                      | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json         | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/java/postunpack.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile
index 3e9f0b99e728..7fc456716397 100644
--- a/bitnami/spark/3.3/debian-11/Dockerfile
+++ b/bitnami/spark/3.3/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-02-26T22:53:27Z" \
+      org.opencontainers.image.created="2023-03-02T01:26:35Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.3.2-debian-11-r3" \
+      org.opencontainers.image.ref.name="3.3.2-debian-11-r4" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.3.2"
@@ -24,7 +24,7 @@ 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-5-linux-${OS_ARCH}-debian-11" \
+      "python-3.8.16-6-linux-${OS_ARCH}-debian-11" \
       "java-1.8.362-2-linux-${OS_ARCH}-debian-11" \
       "spark-3.3.2-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 3203cc0c8200..0bb6aa3dcd8c 100644
--- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "python": {
         "arch": "amd64",
-        "digest": "e6ada4eebb80ec0bf135a4d0edd51b8e975939e2fea74e843b4eadae6a62d54f",
+        "digest": "d1ef0d0e577eb68d61ffda2378cb61c756d6a92db7e0ead6ed8c2b19e600ee77",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.16-5"
+        "version": "3.8.16-6"
     },
     "spark": {
         "arch": "amd64",
diff --git a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/java/postunpack.sh b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/java/postunpack.sh
index f74cbaa0ade9..131803abaeea 100755
--- a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/java/postunpack.sh
+++ b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/java/postunpack.sh
@@ -18,7 +18,7 @@ set -o pipefail
 # Override default files in the Java security directory. This is used for
 # custom base images (with custom CA certificates or block lists is used)
 
-if ! is_dir_empty "$JAVA_EXTRA_SECURITY_DIR"; then
+if [[ -n "${JAVA_EXTRA_SECURITY_DIR:-}" ]] && ! is_dir_empty "$JAVA_EXTRA_SECURITY_DIR"; then
     info "Adding custom CAs to the Java security folder"
     cp -Lr "$JAVA_EXTRA_SECURITY_DIR" /opt/bitnami/java/lib/security
 fi