fix: use array for arguments to container creation
This commit is contained in:
@@ -110,15 +110,15 @@ trigger-scheduler-docker-local-scheduler-run() {
|
|||||||
if [[ "$DOKKU_DETACH_CONTAINER" != "1" ]]; then
|
if [[ "$DOKKU_DETACH_CONTAINER" != "1" ]]; then
|
||||||
DOCKER_START_ARGS_ARRAY+=("--attach")
|
DOCKER_START_ARGS_ARRAY+=("--attach")
|
||||||
|
|
||||||
has_tty && DOCKER_START_ARGS_ARRAY+=" --interactive"
|
has_tty && DOCKER_START_ARGS_ARRAY+=("--interactive")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local EXIT_CODE=0 DOKKU_CONTAINER_EXIT_CODE=0
|
local EXIT_CODE=0 DOKKU_CONTAINER_EXIT_CODE=0
|
||||||
if [[ "$DOKKU_DETACH_CONTAINER" == "1" ]]; then
|
if [[ "$DOKKU_DETACH_CONTAINER" == "1" ]]; then
|
||||||
"$DOCKER_BIN" container start ${DOCKER_START_ARGS_ARRAY[@]} "$CONTAINER_ID" >/dev/null || DOKKU_CONTAINER_EXIT_CODE=$?
|
"$DOCKER_BIN" container start "${DOCKER_START_ARGS_ARRAY[@]}" "$CONTAINER_ID" >/dev/null || DOKKU_CONTAINER_EXIT_CODE=$?
|
||||||
echo "$CONTAINER_ID"
|
echo "$CONTAINER_ID"
|
||||||
else
|
else
|
||||||
"$DOCKER_BIN" container start ${DOCKER_START_ARGS_ARRAY[@]} "$CONTAINER_ID" || EXIT_CODE=$?
|
"$DOCKER_BIN" container start "${DOCKER_START_ARGS_ARRAY[@]}" "$CONTAINER_ID" || EXIT_CODE=$?
|
||||||
DOKKU_CONTAINER_EXIT_CODE="$("$DOCKER_BIN" container wait "$CONTAINER_ID" 2>/dev/null || echo "$EXIT_CODE")"
|
DOKKU_CONTAINER_EXIT_CODE="$("$DOCKER_BIN" container wait "$CONTAINER_ID" 2>/dev/null || echo "$EXIT_CODE")"
|
||||||
[[ -z "$DOKKU_CONTAINER_EXIT_CODE" ]] && DOKKU_CONTAINER_EXIT_CODE=0
|
[[ -z "$DOKKU_CONTAINER_EXIT_CODE" ]] && DOKKU_CONTAINER_EXIT_CODE=0
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user