Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,24 @@ if [ -z ${BCO_MODULE_PREPARE_SCRIPT+x} ]; then
echo "no module preperation required.";
else
echo "prepare bco modules...";
source /usr/local/bin/${BCO_MODULE_PREPARE_SCRIPT};
# shellcheck disable=SC1090 # source a dynamic script path intentionally
source /usr/local/bin/"${BCO_MODULE_PREPARE_SCRIPT}";
fi

# replace the current pid 1 with original entrypoint
echo "start main application: $@"
# Use printf to safely print all positional args without mixing scalar and array expansions
printf 'start main application: %s\n' "$*"

set -- "$@" --bco-home "${BCO_HOME}" --log-dir "${BCO_LOGS}" --host "${MQTT_BROKER}" "${BCO_OPTIONS}"
# If BCO_OPTIONS contains multiple space-separated arguments, expand them as distinct
# arguments by splitting into a bash array. This avoids passing the entire string as
# a single argument when using "${BCO_OPTIONS}".
_bco_options_array=()
if [ -n "${BCO_OPTIONS:-}" ]; then
# read -a splits on IFS (whitespace), preserving each option as a separate element
# Note: if options themselves need to contain spaces, provide them via an array env
# or a different mechanism; this simple split handles the common case of multiple flags.
read -r -a _bco_options_array <<< "${BCO_OPTIONS}"
fi

set -- "$@" --bco-home "${BCO_HOME}" --log-dir "${BCO_LOGS}" --host "${MQTT_BROKER}" "${_bco_options_array[@]}"
exec "$@"
4 changes: 2 additions & 2 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ version.org.openbase..jul.communication.mqtt.test=3.7.2

version.org.openbase..jul.transformation=3.7.2

version.org.testcontainers..junit-jupiter=1.18.3
version.org.testcontainers..junit-jupiter=1.21.4

version.org.testcontainers..testcontainers=1.18.3
version.org.testcontainers..testcontainers=2.0.3

version.org.springframework.boot..spring-boot-starter-webflux=3.1.2

Expand Down