From 743484fb4cf95c7c97a454aa1698815bfaf381e4 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Tue, 6 Sep 2022 20:04:30 +0300
Subject: [PATCH] fix: Suppress useradd/groupadd errors (#4408)
---
docker/scripts/app-setup-debian.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker/scripts/app-setup-debian.sh b/docker/scripts/app-setup-debian.sh
index a66ba8197..ddfc35199 100644
--- a/docker/scripts/app-setup-debian.sh
+++ b/docker/scripts/app-setup-debian.sh
@@ -193,14 +193,14 @@ if id -u ${USERNAME} > /dev/null 2>&1; then
else
# Create user
if [ "${USER_GID}" = "automatic" ]; then
- groupadd $USERNAME
+ groupadd --force $USERNAME
else
- groupadd --gid $USER_GID $USERNAME
+ groupadd --force --gid $USER_GID $USERNAME
fi
if [ "${USER_UID}" = "automatic" ]; then
- useradd -s /bin/bash --gid $USERNAME -m $USERNAME
+ useradd -s /bin/bash --gid $USERNAME -m $USERNAME || true
else
- useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME
+ useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME || true
fi
fi