From 1871f6c8d2af48c31bd533e67a0e208d89f0f71a Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Thu, 5 Oct 2023 21:25:02 +0200
Subject: [PATCH] change owner id during startup

---
 app/Dockerfile    |  6 ------
 app/entrypoint.sh | 14 ++++++++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index ddcfc42..f90177f 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -37,12 +37,6 @@ ENV SERVICE_NAME=$SERVICE_NAME
 ENV UID=$UID
 ENV GID=$GID 
 
-
-
-RUN addgroup --gid $GID $SERVICE_NAME && \
-    adduser --ingroup $SERVICE_NAME --shell /bin/false --disabled-password --uid $UID $SERVICE_NAME && \
-    mkdir -p /home/$SERVICE_NAME/log /home/$SERVICE_NAME/config && \
-    chown -R $SERVICE_NAME:$SERVICE_NAME /home/$SERVICE_NAME
     
 # set the working directory in the container
 WORKDIR /home/$SERVICE_NAME
diff --git a/app/entrypoint.sh b/app/entrypoint.sh
index 6c51ae2..8360c44 100644
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -3,12 +3,18 @@ set -e
 
 user="$(id -u)"
 echo "######################################################"
-echo "# start: '$SERVICE_NAME' Version:$VERSION"
-echo "# with UserID:$UID, GroupID:$GID"
-echo "######################################################"
+echo "# prepare: '$SERVICE_NAME' Version:$VERSION"
+echo "# for running with UserID:$UID, GroupID:$GID"
+echo "#"
 
 if [ "$user" = '0' ]; then
-	[ -d "/home/$SERVICE_NAME" ] && chown -R $SERVICE_NAME:$SERVICE_NAME /home/$SERVICE_NAME || true
+    mkdir -p /home/$SERVICE_NAME/log /home/$SERVICE_NAME/config
+    addgroup --gid $GID $SERVICE_NAME 2> /dev/null
+    adduser --ingroup $SERVICE_NAME --shell /bin/false --disabled-password --no-create-home --comment "" --uid $UID $SERVICE_NAME    
+	chown -R $SERVICE_NAME:$SERVICE_NAME /home/$SERVICE_NAME || true
+    echo "######################################################"
+    echo "#"
+
     exec gosu $SERVICE_NAME "$@"
 else
     exec "$@"