Different approach, always create npmuser

even if the user id is zero, and then we'll always use it
This commit is contained in:
Jamie Curnow
2023-03-30 11:19:16 +10:00
parent dad8561ea1
commit 4a86bb42cc
6 changed files with 33 additions and 61 deletions

View File

@ -3,23 +3,18 @@
set -e
if [ "$PUID" = '0' ]; then
log_info 'Skipping npmuser configuration'
log_info 'Configuring npmuser ...'
if id -u npmuser; then
# user already exists
usermod -u "$PUID" npmuser || exit 1
else
log_info 'Configuring npmuser ...'
groupmod -g 1000 users || exit 1
if id -u npmuser; then
# user already exists
usermod -u "$PUID" npmuser || exit 1
else
# Add npmuser user
useradd -u "$PUID" -U -d /tmp/npmuserhome -s /bin/false npmuser || exit 1
fi
usermod -G users npmuser || exit 1
groupmod -o -g "$PGID" npmuser || exit 1
# Home for npmuser
mkdir -p /tmp/npmuserhome
chown -R "$PUID:$PGID" /tmp/npmuserhome
# Add npmuser user
useradd -o -u "$PUID" -U -d /tmp/npmuserhome -s /bin/false npmuser || exit 1
fi
usermod -G "$PGID" npmuser || exit 1
groupmod -o -g "$PGID" npmuser || exit 1
# Home for npmuser
mkdir -p /tmp/npmuserhome
chown -R "$PUID:$PGID" /tmp/npmuserhome

View File

@ -3,17 +3,15 @@
set -e
echo
echo "-------------------------------------
echo "
-------------------------------------
_ _ ____ __ __
| \ | | _ \| \/ |
| \| | |_) | |\/| |
| |\ | __/| | | |
|_| \_|_| |_| |_|
-------------------------------------"
if [[ "$PUID" -ne '0' ]]; then
echo "User UID: $(id -u npmuser)"
echo "User GID: $(id -g npmuser)"
echo "-------------------------------------"
fi
echo
-------------------------------------
User ID: $PUID
Group ID: $PGID
-------------------------------------
"