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.

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

Set USER var from PPID if USER is not present #498

Merged
merged 1 commit into from
Aug 13, 2021
Merged

Set USER var from PPID if USER is not present #498

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
4 changes: 4 additions & 0 deletions jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,10 @@ echo '# END SECTION'
BUILDSH_CCACHE
fi

# In upstart jobs (Xenial) the USER variable is not set for the jenkins
# session. Fallback to get the user from processes table
USER=${USER:-$(ps -o user= -p $PPID)}

cat >> Dockerfile << DELIM_DOCKER_USER
# Create a user with passwordless sudo
ARG USERID
Expand Down