Skip to content

Commit

Permalink
Set PODMAN_USERNS=keep-id when invoking 'docker run' (#1069)
Browse files Browse the repository at this point in the history
I missed the RPM release jobs when I made this change everywhere else in
ros_buildfarm.

Follow-up to d6df50a
  • Loading branch information
cottsay authored Nov 1, 2024
1 parent 0cc78ed commit cf3d223
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ros_buildfarm/templates/release/rpm/binarypkg_job.xml.em
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ but disabled since the package is blacklisted (or not whitelisted) in the config
] + ([
'if [ ! -d "$HOME/.ccache" ]; then mkdir $HOME/.ccache; fi',
] if shared_ccache else []) + [
'# If using Podman, change the user namespace to preserve UID. No effect if using Docker.',
'export PODMAN_USERNS=keep-id',
'docker run' +
' --rm' +
' --privileged' +
Expand Down
2 changes: 2 additions & 0 deletions ros_buildfarm/templates/release/rpm/sourcepkg_job.xml.em
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ but disabled since the package is blacklisted (or not whitelisted) in the config
'echo "# BEGIN SECTION: Run Dockerfile - generate sourcerpm"',
'rm -fr $WORKSPACE/sourcepkg',
'mkdir -p $WORKSPACE/sourcepkg',
'# If using Podman, change the user namespace to preserve UID. No effect if using Docker.',
'export PODMAN_USERNS=keep-id',
'docker run' +
' --rm' +
' --privileged' +
Expand Down

0 comments on commit cf3d223

Please sign in to comment.