fix(scripts): pass args safely; drop bash -c usage#218
Merged
b23prodtm merged 4 commits intofix/composefrom Feb 16, 2026
Merged
Conversation
### What changed
- Use Docker BuildKit secret mount for `master_password` in `Dockerfile.x86_64`.
- Read secret from `/run/secrets/master_password` into `MASTER_PASSWORD` during `RUN`.
- Pass `-p` to `./configure.sh` only when `MASTER_PASSWORD` is set using `${MASTER_PASSWORD:+-p "$MASTER_PASSWORD"}`.
- Keep database migration steps unchanged.
### Why
- Prevents leaking credentials into image layers, env, or build args.
- Allows builds to proceed without a password by omitting the `-p` flag when unset.
### Build notes
- Requires BuildKit: set `DOCKER_BUILDKIT=1`.
- Provide the secret at build time, e.g.:
`docker build --secret id=master_password,src=./master_password.txt .`
This change replaces unsafe string-based command execution with direct invocation and proper argument forwarding across several scripts. - Update `shell_prompt` to accept a script plus optional prompt flag and forward remaining args; run via `"$script" "$@"` instead of `bash -c`. - Replace `bash -c` with direct calls and `"$@"` in `Scripts/bootstrap.sh`, `Scripts/composer.sh`, and `migrate-database.sh`. - Adjust call sites to pass flags as separate, quoted args (e.g., `-f "$hash"`, `-p "$password" -s "$salt" -f "$file"`), and prefer `"$@"` over `$*`. - Improve usage/help text and simplify prompt logic and case patterns. Benefits: - Preserves whitespace and special characters in args - Reduces risk of injection and masked errors - Aligns scripts to consistent, safe argument handling
b23prodtm
changed the base branch from
chunk/buildkit-secret-master-password-1771185716586
to
fix/compose
b23prodtm
changed the base branch from
fix/compose
to
chunk/buildkit-secret-master-password-1771185716586
b23prodtm
changed the base branch from
chunk/buildkit-secret-master-password-1771185716586
to
fix/compose
b23prodtm
approved these changes
Feb 16, 2026
b23prodtm
deleted the
chunk/fix-shell-safe-arg-passing-drop-bash-c-1771189119040
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Prompt Given
the way I pass "$@" as variable args to function is causing the configuration issue
This change replaces unsafe string-based command execution with direct invocation and proper argument forwarding across several scripts.
shell_promptto accept a script plus optional prompt flag and forward remaining args; run via"$script" "$@"instead ofbash -c.bash -cwith direct calls and"$@"inScripts/bootstrap.sh,Scripts/composer.sh, andmigrate-database.sh.-f "$hash",-p "$password" -s "$salt" -f "$file"), and prefer"$@"over$*.Benefits:
Give feedback on this PR