From 176195277dbdcaaa71b8654ec161f461cae0ae42 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 24 Aug 2021 21:57:09 +0000
Subject: [PATCH] 3.1.2-debian-10-r70 release

---
 bitnami/spark/3/debian-10/Dockerfile          |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libfile.sh | 24 +++++++++++++++++--
 bitnami/spark/README.md                       |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/bitnami/spark/3/debian-10/Dockerfile b/bitnami/spark/3/debian-10/Dockerfile
index 2f9b9d3e47f9..21f5b5d70446 100644
--- a/bitnami/spark/3/debian-10/Dockerfile
+++ b/bitnami/spark/3/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spark/postunpack.sh
 ENV BITNAMI_APP_NAME="spark" \
-    BITNAMI_IMAGE_VERSION="3.1.2-debian-10-r69" \
+    BITNAMI_IMAGE_VERSION="3.1.2-debian-10-r70" \
     JAVA_HOME="/opt/bitnami/java" \
     LD_LIBRARY_PATH="/opt/bitnami/python/lib/:/opt/bitnami/spark/venv/lib/python3.6/site-packages/numpy.libs/:$LD_LIBRARY_PATH" \
     LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
index dd47f25e4e45..41ebaf7464f6 100644
--- a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -10,7 +10,7 @@
 # Functions
 
 ########################
-# Replace a regex in a file
+# Replace a regex-matching string in a file
 # Arguments:
 #   $1 - filename
 #   $2 - match regex
@@ -30,7 +30,7 @@ replace_in_file() {
     # We should avoid using 'sed in-place' substitutions
     # 1) They are not compatible with files mounted from ConfigMap(s)
     # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
-    del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
     if [[ $posix_regex = true ]]; then
         result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")"
     else
@@ -39,6 +39,26 @@ replace_in_file() {
     echo "$result" > "$filename"
 }
 
+########################
+# Replace a regex-matching multiline string in a file
+# Arguments:
+#   $1 - filename
+#   $2 - match regex
+#   $3 - substitute regex
+# Returns:
+#   None
+#########################
+replace_in_file_multiline() {
+    local filename="${1:?filename is required}"
+    local match_regex="${2:?match regex is required}"
+    local substitute_regex="${3:?substitute regex is required}"
+
+    local result
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")"
+    echo "$result" > "$filename"
+}
+
 ########################
 # Remove a line in a file based on a regex
 # Arguments:
diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md
index 5f5b34527063..592daedaa853 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-debian-10`, `3.1.2`, `3.1.2-debian-10-r69`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.1.2-debian-10-r69/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.1.2`, `3.1.2-debian-10-r70`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.1.2-debian-10-r70/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spark GitHub repo](https://github.com/bitnami/bitnami-docker-spark).