Reverts commits 79908b3c6, 083c5a042, e1ff75624, ff77fa248. (#3496)

The non-root user approach had multiple issues with RunPod
compatibility, sudo PATH handling, and tmux in exec sessions.
Restoring root as the default user for now.

scripts/cloud-entrypoint.sh

@@ -1,37 +1,19 @@
 #!/bin/bash
 
-# Detect if running as non-root and set sudo prefix accordingly
-if [ "$(id -u)" -ne 0 ]; then
-    SUDO="sudo"
-    RUN_AS_USER=""
-else
-    SUDO=""
-    RUN_AS_USER="sudo -u ubuntu"
-fi
-
 # Export specific ENV variables to /etc/rp_environment
 echo "Exporting environment variables..."
-printenv | grep -E '^HF_|^BNB_|^CUDA_|^NCCL_|^NV|^RUNPOD_|^PATH=|^_=' | sed 's/^\([^=]*\)=\(.*\)$/export \1="\2"/' | grep -v 'printenv' | $SUDO tee /etc/rp_environment > /dev/null
-
-# Add rp_environment sourcing to ubuntu's bashrc (if ubuntu user exists and line not already present)
-if id ubuntu &>/dev/null; then
-    grep -q 'source /etc/rp_environment' /home/ubuntu/.bashrc 2>/dev/null || \
-        echo 'source /etc/rp_environment' >> /home/ubuntu/.bashrc
-fi
-# Also add to current user's bashrc if different from ubuntu
-grep -q 'source /etc/rp_environment' ~/.bashrc 2>/dev/null || \
-    echo 'source /etc/rp_environment' >> ~/.bashrc
+printenv | grep -E '^HF_|^BNB_|^CUDA_|^NCCL_|^NV|^RUNPOD_|^PATH=|^_=' | sed 's/^\([^=]*\)=\(.*\)$/export \1="\2"/' | grep -v 'printenv' >> /etc/rp_environment
+echo 'source /etc/rp_environment' >> ~/.bashrc
 
 add_keys_to_authorized() {
     local key_value=$1
-    local target_home=$2
 
-    # Create the .ssh directory and set permissions
-    mkdir -p "$target_home/.ssh"
-    chmod 700 "$target_home/.ssh"
+    # Create the ~/.ssh directory and set permissions
+    mkdir -p ~/.ssh
+    chmod 700 ~/.ssh
 
     # Create the authorized_keys file if it doesn't exist
-    touch "$target_home/.ssh/authorized_keys"
+    touch ~/.ssh/authorized_keys
 
     # Initialize an empty key variable
     local key=""
@@ -42,7 +24,7 @@ add_keys_to_authorized() {
         if [[ $word == ssh-* ]]; then
             # If there's a key being built, add it to the authorized_keys file
             if [[ -n $key ]]; then
-                echo $key >> "$target_home/.ssh/authorized_keys"
+                echo $key >> ~/.ssh/authorized_keys
             fi
             # Start a new key
             key=$word
@@ -54,42 +36,29 @@ add_keys_to_authorized() {
 
     # Add the last key to the authorized_keys file
     if [[ -n $key ]]; then
-        echo $key >> "$target_home/.ssh/authorized_keys"
+        echo $key >> ~/.ssh/authorized_keys
     fi
 
     # Set the correct permissions
-    chmod 600 "$target_home/.ssh/authorized_keys"
-    chmod 700 -R "$target_home/.ssh"
-}
-
-setup_ssh_keys() {
-    local key_value=$1
-
-    # Set up keys for the current user
-    add_keys_to_authorized "$key_value" "$HOME"
-
-    # Also set up keys for ubuntu user if we're root and ubuntu exists
-    if [ "$(id -u)" -eq 0 ] && id ubuntu &>/dev/null; then
-        add_keys_to_authorized "$key_value" "/home/ubuntu"
-        chown -R ubuntu:ubuntu /home/ubuntu/.ssh
-    fi
+    chmod 600 ~/.ssh/authorized_keys
+    chmod 700 -R ~/.ssh
 }
 
 # Set SSH port
 if [ ! -z "$SSH_PORT" ]; then
-    $SUDO sed -i "s/#Port 22/Port $SSH_PORT/" /etc/ssh/sshd_config
+    sed -i "s/#Port 22/Port $SSH_PORT/" /etc/ssh/sshd_config
 fi
 
 if [[ $PUBLIC_KEY ]]; then
     # runpod, prime intellect
-    setup_ssh_keys "$PUBLIC_KEY"
+    add_keys_to_authorized "$PUBLIC_KEY"
     # Start the SSH service in the background
-    $SUDO service ssh start
+    service ssh start
 elif [[ $SSH_KEY ]]; then
     # latitude.sh
-    setup_ssh_keys "$SSH_KEY"
+    add_keys_to_authorized "$SSH_KEY"
     # Start the SSH service in the background
-    $SUDO service ssh start
+    service ssh start
 else
     echo "No PUBLIC_KEY or SSH_KEY environment variable provided, not starting openSSH daemon"
 fi
@@ -101,16 +70,8 @@ if [ -n "$JUPYTER_PASSWORD" ]; then
 fi
 
 if [ "$JUPYTER_DISABLE" != "1" ]; then
-    # Run Jupyter Lab as ubuntu user when possible
-    JUPYTER_ARGS="--port=8888 --ip=* --ServerApp.allow_origin=*"
-    if [ "$(id -u)" -eq 0 ] && id ubuntu &>/dev/null; then
-        sudo --preserve-env=PATH,JUPYTER_TOKEN -u ubuntu jupyter lab $JUPYTER_ARGS &
-    else
-        if [ "$(id -u)" -eq 0 ]; then
-            JUPYTER_ARGS="$JUPYTER_ARGS --allow-root"
-        fi
-        jupyter lab $JUPYTER_ARGS &
-    fi
+    # Run Jupyter Lab in the background
+    jupyter lab --port=8888 --ip=* --allow-root --ServerApp.allow_origin=* &
 fi
 
 if [ ! -d "/workspace/data/axolotl-artifacts" ]; then
@@ -119,19 +80,14 @@ fi
 if [ ! -L "/workspace/axolotl/outputs" ]; then
     ln -sf /workspace/data/axolotl-artifacts /workspace/axolotl/outputs
 fi
-chown -R ubuntu:ubuntu /workspace 2>/dev/null || true
 
 # start the runpod slurm init
 SLURM_INIT="${SLURM_INIT:-/slurm-init.sh}"
 
 if [[ -f "$SLURM_INIT" ]]; then
   echo "[entrypoint] running $SLURM_INIT..."
-  $SUDO bash "$SLURM_INIT"
+  bash "$SLURM_INIT"
 fi
 
-# Execute the passed arguments (CMD) as ubuntu when possible
-if [ "$(id -u)" -eq 0 ] && id ubuntu &>/dev/null; then
-    exec sudo --preserve-env=PATH -u ubuntu "$@"
-else
-    exec "$@"
-fi
+# Execute the passed arguments (CMD)
+exec "$@"