Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-14 14:58:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move JAVA_OPTS to __run_flags.

Browse Source
This commit is contained in:
Alexey Zhokhov
2020-06-29 19:00:03 +08:00
parent 26b7d995db
commit 7046494bbd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
View File

@@ -49,6 +49,9 @@ export SPRING_CLOUD_DATAFLOW_M2_DIR="/.m2"
export SPRING_CLOUD_DATAFLOW_DAEMON_USER="dataflow" export SPRING_CLOUD_DATAFLOW_DAEMON_USER="dataflow"
export SPRING_CLOUD_DATAFLOW_DAEMON_GROUP="dataflow" export SPRING_CLOUD_DATAFLOW_DAEMON_GROUP="dataflow"
# Java settings
export JAVA_OPTS="${JAVA_OPTS:-}"
# Dataflow settings # Dataflow settings
export SERVER_PORT="${SERVER_PORT:-}" export SERVER_PORT="${SERVER_PORT:-}"
export SPRING_CLOUD_CONFIG_ENABLED="${SPRING_CLOUD_CONFIG_ENABLED:-false}" export SPRING_CLOUD_CONFIG_ENABLED="${SPRING_CLOUD_CONFIG_ENABLED:-false}"

6
bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh
View File

@@ -19,10 +19,10 @@ set -o pipefail
info "** Starting Spring Cloud Data Flow **" info "** Starting Spring Cloud Data Flow **"
__run_cmd="java" __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 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 else
exec "${__run_cmd}" ${JAVA_OPTS} "${__run_flags[@]}" exec "${__run_cmd}" "${__run_flags[@]}"
fi fi