From 7046494bbdf37ce4fd6a16fd419728ebcfc59830 Mon Sep 17 00:00:00 2001
From: Alexey Zhokhov <alexey@zhokhov.com>
Date: Mon, 29 Jun 2020 19:00:03 +0800
Subject: [PATCH] Move JAVA_OPTS to __run_flags.

---
 .../rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh | 3 +++
 .../rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
index f4883121887e..b2a8812a0450 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
@@ -49,6 +49,9 @@ export SPRING_CLOUD_DATAFLOW_M2_DIR="/.m2"
 export SPRING_CLOUD_DATAFLOW_DAEMON_USER="dataflow"
 export SPRING_CLOUD_DATAFLOW_DAEMON_GROUP="dataflow"
 
+# Java settings
+export JAVA_OPTS="${JAVA_OPTS:-}"
+
 # Dataflow settings
 export SERVER_PORT="${SERVER_PORT:-}"
 export SPRING_CLOUD_CONFIG_ENABLED="${SPRING_CLOUD_CONFIG_ENABLED:-false}"
diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh
index 0b94fadcb263..9b7853392f8d 100755
--- a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh
@@ -19,10 +19,10 @@ set -o pipefail
 info "** Starting Spring Cloud Data Flow **"
 
 __run_cmd="java"
-__run_flags=("-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_DATAFLOW_BASE_DIR}/spring-cloud-dataflow.jar" "--spring.config.additional-location=${SPRING_CLOUD_DATAFLOW_CONF_FILE}" "$@")
+__run_flags=($JAVA_OPTS "-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_DATAFLOW_BASE_DIR}/spring-cloud-dataflow.jar" "--spring.config.additional-location=${SPRING_CLOUD_DATAFLOW_CONF_FILE}" "$@")
 
 if am_i_root; then
-    exec gosu "$SPRING_CLOUD_DATAFLOW_DAEMON_USER" "${__run_cmd}" ${JAVA_OPTS} "${__run_flags[@]}"
+    exec gosu "$SPRING_CLOUD_DATAFLOW_DAEMON_USER" "${__run_cmd}" "${__run_flags[@]}"
 else
-    exec "${__run_cmd}" ${JAVA_OPTS} "${__run_flags[@]}"
+    exec "${__run_cmd}" "${__run_flags[@]}"
 fi