fix: preserve global flags when sudo is sudo-rs

`sudo-rs`, the default sudo on Ubuntu 25.10 and later, does not support preserving the entire environment, so `--quiet`, `--trace`, `--force` and `--app` stopped taking effect once `dokku` re-executed itself as the `dokku` user, and a warning was printed on every invocation. Variables outside the set dokku forwards no longer cross that boundary and can be named in `DOKKU_PRESERVE_ENV` instead.
This commit is contained in:
Jose Diaz-Gonzalez committed 2026-09-20 04:11:15 -04:00
1 parent c04e74c668
commit 6b1b7bc6f6
14 files changed
+403 -10

No files matched your search

+6 -1
View File
@@ -67,6 +67,9 @@ export DOKKU_GLOBAL_RUN_ARGS="--label=org.label-schema.schema-version=1.0 --labe
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
# the original argv is kept so the re-exec as the dokku user can replay it verbatim
# and let the child re-parse the global flags for itself. parse_args and the
# flag-stripping loop below must therefore stay pure functions of argv.
parse_args "$@"
args=("$@")
skip_arg=false
@@ -91,7 +94,9 @@ if [[ $(id -un) != "dokku" ]]; then
if [[ ! $1 =~ plugin:* ]] && [[ $1 != "ssh-keys:add" ]] && [[ $1 != "ssh-keys:remove" ]] && [[ $1 != "scheduler-k3s:initialize" ]] && [[ $1 != "scheduler-k3s:uninstall" ]]; then
unset DOKKU_PID TMP TMPDIR TEMP TEMPDIR
export SSH_USER=$(id -un)
sudo -u dokku -E -H "$0" "$@"
read -ra preserved_env_names <<<"$(fn-cli-preserved-env-names)"
preserve_env_flag="$(fn-sudo-preserve-env-flag "${preserved_env_names[@]}")"
sudo -u dokku "$preserve_env_flag" -H "$0" "${args[@]}"
exit $?
fi
fi