Skip to content

Commit

Permalink
Fix unintended environment variable config passthrough to services (#540
Browse files Browse the repository at this point in the history
)
  • Loading branch information
leighmcculloch authored Jan 3, 2024
1 parent ff3dd50 commit cbdb783
Showing 1 changed file with 5 additions and 1 deletion.
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

0 comments on commit cbdb783

Please sign in to comment.