refactor(tdp-builder): revert to previous docker-entrypoint.sh

Author: SteBaum

build-env/docker-entrypoint.sh

@@ -3,9 +3,9 @@ set -eo pipefail
 
 if [[ -n "$BUILDER_UID" ]] && [[ -n "$BUILDER_GID" ]]; then
     # Create group and user only if they don't exist
-    [[ ! $(getent group builder) ]] && groupadd --gid "$BUILDER_GID" --system builder
-    if [[ ! $(getent passwd builder) ]]; then
-        useradd --uid "$BUILDER_UID" --system --gid builder --home-dir /home/builder builder
+    [[ ! $(getent group "$BUILDER_GID") ]] && groupadd --gid "$BUILDER_GID" --system builder
+    if [[ ! $(getent passwd "$BUILDER_UID") ]]; then
+        useradd --uid "$BUILDER_UID" --system --gid "$BUILDER_GID" --home-dir /home/builder builder
         # Avoid useradd warning if home dir already exists by making home dir ourselves.
         # Home dir can exists if mounted via "docker run -v ...:/home/builder/...".
         mkdir -p /home/builder
@@ -15,9 +15,9 @@ if [[ -n "$BUILDER_UID" ]] && [[ -n "$BUILDER_GID" ]]; then
     # Avoid changing dir if a work dir is specified
     [[ "$PWD" == "/root" ]] && cd /home/builder
     if [[ -z "$@" ]]; then
-        exec gosu builder /bin/bash
+        exec gosu $BUILDER_UID /bin/bash
     else
-        exec gosu builder "$@"
+        exec gosu $BUILDER_UID "$@"
     fi
 fi