Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unintended environment variable config passthrough to services #540

Merged
merged 9 commits into from
Jan 3, 2024
Merged
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
6 changes: 5 additions & 1 deletion start
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,11 @@ function exec_supervisor() {
echo "supervisor: starting"
upgrade_local &
service_status &
exec supervisord -n -c $SUPHOME/etc/supervisord.conf \
# Run supervisord in a new environment (using `env -i`) because supervisord
# inherits the env vars of its environment for all subprocesses that get
# started. This is problematic for services that use the same environment
# variable name for things that the start script does, like NETWORK.
exec env -i supervisord -n -c $SUPHOME/etc/supervisord.conf \
> >(sed -u 's/^/supervisor: /') \
2> >(sed -u 's/^/supervisor: /' >&2)
}
Expand Down
Loading