Skip to content

Commit

Permalink
Merge #122551
Browse files Browse the repository at this point in the history
122551: docker: pass `COCKROACH_ARGS` without quoting r=rickystewart a=rail

Previously, the `COCKROACH_ARGS` variable was passed quoted, what converted it into a single string. If the variable is set to something more than one word, the whole string is passed as a single argument.

This PR removes the surrounding quotes to let field splitting convert the string into multiple arguments.

Fixes: #122441
Release note: None

Co-authored-by: Rail Aliiev <rail@iqchoice.com>
  • Loading branch information
craig[bot] and rail committed Apr 19, 2024
2 parents c664210 + f1eb28a commit e6ca135
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/deploy/cockroach.sh
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ _main() {
set_env_var "COCKROACH_ARGS"

if [[ -n "$COCKROACH_ARGS" ]]; then
_main "$COCKROACH_ARGS"
_main $COCKROACH_ARGS
else
_main "$@"
fi

0 comments on commit e6ca135

Please sign in to comment.