Skip to content

Commit c40e48e

Browse files
committed
Fix docker restart because user already exists
1 parent 124cb18 commit c40e48e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@ set -e
66
PUID=${PUID:-911}
77
PGID=${PGID:-911}
88

9-
# Add npmuser user
10-
log_info 'Creating npmuser ...'
9+
log_info 'Configuring npmuser ...'
1110

1211
groupmod -g 1000 users || exit 1
13-
useradd -u "${PUID}" -U -d /tmp/npmuserhome -s /bin/false npmuser || exit 1
12+
13+
if id -u npmuser; then
14+
# user already exists
15+
usermod -u "${PUID}" npmuser || exit 1
16+
else
17+
# Add npmuser user
18+
useradd -u "${PUID}" -U -d /tmp/npmuserhome -s /bin/false npmuser || exit 1
19+
fi
20+
1421
usermod -G users npmuser || exit 1
15-
groupmod -o -g "$PGID" npmuser || exit 1
22+
groupmod -o -g "${PGID}" npmuser || exit 1
1623
# Home for npmuser
1724
mkdir -p /tmp/npmuserhome
1825
chown -R npmuser:npmuser /tmp/npmuserhome

0 commit comments

Comments
 (0)