From 58ce3aad6c63b42479bfe8357910fbf721da74de Mon Sep 17 00:00:00 2001
From: yijunge-ucb <yijunge@berkeley.edu>
Date: Mon, 18 May 2026 12:54:45 -0700
Subject: [PATCH] Refactor user and group creation in Dockerfile

---
 Dockerfile | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 289e9a0..0b20528 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,29 @@ RUN apt-get -qq update --yes && \
     echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
 
-RUN adduser --disabled-password --gecos "Default Jupyter user" ${NB_USER}
+RUN if getent group ${NB_UID}; then \
+      GROUP_1000="$(getent group ${NB_UID} | cut -d: -f1)"; \
+      if [ "$GROUP_1000" != "$NB_USER" ]; then \
+        groupmod --new-name ${NB_USER} "$GROUP_1000"; \
+      fi; \
+    else \
+      groupadd --gid ${NB_UID} ${NB_USER}; \
+    fi
+RUN if id ${NB_UID}; then \
+      USER_1000="$(id ${NB_UID} -un)"; \
+      if [ "$USER_1000" != "$NB_USER" ]; then \
+        usermod --home "/home/$NB_USER" --login "$NB_USER" --move-home "$USER_1000"; \
+      fi; \
+    else \
+      useradd \
+        --comment "Default user" \
+        --create-home \
+        --gid ${NB_UID} \
+        --no-log-init \
+        --shell /bin/bash \
+        --uid ${NB_UID} \
+        ${NB_USER}; \
+    fi
 
 # -------------------------------------------------------------------
 # Man pages