Skip to content

[3.15] gh-159452: Run the regen-configure container as the invoking user (GH-159454) #161680

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.

Sign up for GitHub

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

Merged
itamaro merged 1 commit into from
Nov 9, 2026
Merged

[3.15] gh-159452: Run the regen-configure container as the invoking user (GH-159454) #161680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2026-10-15-17-19-41.gh-issue-159452.oJ1saO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``Tools/build/regen-configure.sh`` no longer leaves
root-owned files in the source tree.
25 changes: 24 additions & 1 deletion Tools/build/regen-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,27 @@ if command -v selinuxenabled >/dev/null && selinuxenabled; then
PATH_OPT=":Z"
fi

"$RUNTIME" run --rm -v "$abs_srcdir:$WORK_DIR$PATH_OPT" "$IMAGE"
# Run the container as the invoking user so that generated files are owned by
# that user and not by root. Rootless runtimes already map root to the invoking
# user, so a user mapping is only needed for rootful Docker.
USER_OPT=""
case "$RUNTIME" in
podman)
USER_OPT="--userns=keep-id"
;;
docker)
if ! docker info --format '{{.SecurityOptions}}' | grep -q rootless; then
USER_OPT="-u $(id -u):$(id -g)"
fi
;;
esac

purge_autom4te_cache() {
[ -d "$abs_srcdir/autom4te.cache" ] || return 0
"$RUNTIME" run --rm -v "$abs_srcdir:$WORK_DIR$PATH_OPT" \
"$IMAGE" sh -c "rm -rf $WORK_DIR/autom4te.cache"
}

purge_autom4te_cache
trap 'purge_autom4te_cache || true' EXIT
"$RUNTIME" run --rm $USER_OPT -v "$abs_srcdir:$WORK_DIR$PATH_OPT" "$IMAGE"
Loading