diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index d221bbb97..53cc0647a 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -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 "$@" diff --git a/lib/jul b/lib/jul index 624961115..9d9befebe 160000 --- a/lib/jul +++ b/lib/jul @@ -1 +1 @@ -Subproject commit 624961115af6d25863de263b70c857320d0fc7a4 +Subproject commit 9d9befebe197fd170f73518483ce213bef661653 diff --git a/versions.properties b/versions.properties index 498267fe1..5a79e9c92 100644 --- a/versions.properties +++ b/versions.properties @@ -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