From c2c3590b0c729a21ff305d369cbbe06909cb712f Mon Sep 17 00:00:00 2001
From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com>
Date: Tue, 16 Apr 2024 02:13:12 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Change=20default=20user?=
 =?UTF-8?q?=20to=20`ubuntu`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .scripts/entrypoint.sh | 8 ++++----
 base.Dockerfile        | 2 +-
 server.Dockerfile      | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.scripts/entrypoint.sh b/.scripts/entrypoint.sh
index bef55752..7a308aa5 100644
--- a/.scripts/entrypoint.sh
+++ b/.scripts/entrypoint.sh
@@ -2,11 +2,11 @@
 trap "echo TRAPed signal" HUP INT QUIT TERM
 
 # Create and modify permissions of XDG_RUNTIME_DIR
-sudo -u user mkdir -pm700 /tmp/runtime-netris
-sudo chown user:user /tmp/runtime-netris
-sudo -u user chmod 700 /tmp/runtime-netris
+sudo -u user mkdir -pm700 /tmp/runtime-ubuntu
+sudo chown user:user /tmp/runtime-ubuntu
+sudo -u user chmod 700 /tmp/runtime-ubuntu
 # Make user directory owned by the user in case it is not
-sudo chown netris:netris /home/netris || sudo chown netris:netris /home/user/* || { echo "Failed to change user directory permissions. There may be permission issues."; }
+sudo chown ubuntu:ubuntu /home/ubuntu || sudo chown ubuntu:ubuntu /home/ubuntu/* || { echo "Failed to change user directory permissions. There may be permission issues."; }
 # Remove directories to make sure the desktop environment starts
 sudo rm -rf /tmp/.X* ~/.cache
 # Change time zone from environment variable
diff --git a/base.Dockerfile b/base.Dockerfile
index 265e8513..4fb30761 100644
--- a/base.Dockerfile
+++ b/base.Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:23.10
 
 ENV DEBIAN_FRONTEND=noninteractive \
     TIMEZONE=Africa/Nairobi \
-    XDG_RUNTIME_DIR=/tmp/runtime-netris \ 
+    XDG_RUNTIME_DIR=/tmp/runtime-ubuntu \ 
     DISPLAY=:0 \    
     PULSE_SERVER=unix:/run/pulse/native
     # WAYLAND_DISPLAY=wayland-0
diff --git a/server.Dockerfile b/server.Dockerfile
index bf80630d..790e2eea 100644
--- a/server.Dockerfile
+++ b/server.Dockerfile
@@ -29,14 +29,12 @@ COPY .scripts/proton /usr/bin/netris/
 RUN chmod +x /usr/bin/netris/proton \
     && /usr/bin/netris/proton -i
 
-ARG USERNAME=netris
+ARG USERNAME=ubuntu
 # Create user and assign adequate groups
 RUN apt-get update && apt-get install --no-install-recommends -y \
         sudo \
         tzdata \
     && rm -rf /var/lib/apt/lists/* \
-    && groupadd -g 1000 $USERNAME \
-    && useradd -ms /bin/bash $USERNAME -u 1000 -g 1000 \
     && usermod -a -G adm,audio,cdrom,dialout,dip,fax,floppy,input,lp,lpadmin,plugdev,pulse-access,render,scanner,ssl-cert,sudo,tape,tty,video,voice $USERNAME \
     && echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
     && chown $USERNAME:$USERNAME /home/$USERNAME \