Changes

Dockerfile

@@ -17,10 +17,21 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Create the 'admin' user with home directory and password, and 'administrator' group
+#RUN useradd -m -s /bin/bash admin && \
+#    echo 'admin:password' | chpasswd && \
+#    useradd -m -s /bin/bash ubuntu && \
+#    echo 'ubuntu:password' | chpasswd && \
+#    groupadd administrator && \
+#    usermod -aG administrator,sudo admin && \
+#    usermod -aG administrator,sudo ubuntu
+
+# Create the 'admin' and 'ubuntu' users with home directories and passwords, and add them to the 'sudo' group
 RUN useradd -m -s /bin/bash admin && \
-    echo 'admin:password' | chpasswd &&\
-    groupadd administrator && \
-    usermod -aG administrator,sudo admin
+    echo 'admin:password' | chpasswd && \
+    useradd -m -s /bin/bash ubuntu && \
+    echo 'ubuntu:password' | chpasswd && \
+    usermod -aG sudo admin && \
+    usermod -aG sudo ubuntu
 
 
 # Copy the application code to the container
@@ -65,6 +76,8 @@ RUN python3 -m venv /app/WebSSHEnv && \
     /app/WebSSHEnv/bin/pip install --no-cache-dir webssh && \
     /app/WebSSHEnv/bin/pip list
 
+# Change ownership of /home/admin directory
+RUN chown -R admin:admin /home/admin
 
 # Set working directory
 WORKDIR /app

start.sh

@@ -24,8 +24,8 @@ fi
 
 # Check if 'admin' user exists, create if missing
 if ! id -u admin >/dev/null 2>&1; then
-    echo "* Creating 'admin' user *"
-    useradd -m -s /bin/bash -G sudo admin
+    echo "* Creating $(whoami) user *"
+    useradd -m -s /bin/bash -G sudo $(whoami)
     echo "admin:password" | chpasswd
     echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 fi