From 1091df2ab5da398d0c84484da72e5e030f6cada2 Mon Sep 17 00:00:00 2001 From: George Zubrienko Date: Wed, 23 Nov 2022 13:03:28 +0100 Subject: [PATCH] Remove SPARK_MOUNTED_CONFDIR and SPARK_VOLUME_DIR (#14144) Signed-off-by: George Zubrienko Signed-off-by: George Zubrienko --- .../rootfs/opt/bitnami/scripts/libspark.sh | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh index 840effb7a1fb..4417e0bc8f0a 100644 --- a/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh +++ b/bitnami/spark/3.3/debian-11/rootfs/opt/bitnami/scripts/libspark.sh @@ -25,9 +25,7 @@ spark_env() { cat <<"EOF" # Spark directories export SPARK_BASEDIR="/opt/bitnami/spark" -export SPARK_VOLUMEDIR="/bitnami/spark" export SPARK_CONFDIR="${SPARK_BASEDIR}/conf" -export SPARK_MOUNTED_CONFDIR="${SPARK_VOLUMEDIR}/conf" export SPARK_WORKDIR="${SPARK_BASEDIR}/work" export SPARK_CONF_FILE="${SPARK_CONFDIR}/spark-defaults.conf" export SPARK_LOGDIR="${SPARK_BASEDIR}/logs" @@ -70,22 +68,6 @@ export SPARK_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" EOF } -######################## -# Copy mounted configuration files -# Globals: -# SPARK_* -# Arguments: -# None -# Returns: -# None -######################### -spark_copy_mounted_config() { - if ! is_dir_empty "$SPARK_MOUNTED_CONFDIR"; then - info "Found mounted configuration files in ${SPARK_MOUNTED_CONFDIR}. Copying them to ${SPARK_CONFDIR}" - cp -Lr "$SPARK_MOUNTED_CONFDIR"/* "$SPARK_CONFDIR" - fi -} - ######################## # Validate settings in SPARK_* env vars # Globals: @@ -328,7 +310,6 @@ spark_conf_set() { spark_initialize() { ensure_dir_exists "$SPARK_WORKDIR" am_i_root && chown "$SPARK_DAEMON_USER:$SPARK_DAEMON_GROUP" "$SPARK_WORKDIR" - spark_copy_mounted_config if [[ ! -f "$SPARK_CONF_FILE" ]]; then # Generate default config file spark_generate_conf_file