set user dave

.docker/jazzy.amd64.dockerfile

@@ -6,7 +6,21 @@ ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
 extras/ros-jazzy-gz-harmonic-install.sh install.sh
 RUN bash install.sh
 
-ENV ROS_UNDERLAY /root/ws_dave/install
+# Make user (assume host user has 1000:1000 permission)
+ARG USER=dave
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN addgroup --gid 1000 $USER && \
+    adduser --uid 1000 --ingroup $USER --shell /bin/bash --disabled-password --gecos '' $USER \
+    && echo "$USER:$USER" | chpasswd && adduser $USER sudo \
+    && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+# Set User as user
+USER $USER
+
+# RUN adduser --shell /bin/bash --disabled-password --gecos "" user \
+#     && echo 'user:user' | chpasswd && adduser user sudo \
+#     && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+ENV ROS_UNDERLAY ~/home/$USER/ws_dave/install
 WORKDIR $ROS_UNDERLAY/../src
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\

.docker/jazzy.arm64v8.dockerfile

@@ -4,8 +4,8 @@ ARG ROS_DISTRO="jazzy"
 
 EXPOSE 3389/tcp
 # EXPOSE 22/tcp
-ARG USER=ioes
-ARG PASS=ioes
+ARG USER=dave
+ARG PASS=dave
 ARG X11Forwarding=false
 
 # Set RDP and SSH environments
@@ -86,7 +86,7 @@ ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
 extras/ros-jazzy-gz-harmonic-install.sh install.sh
 RUN bash install.sh
 
-ENV ROS_UNDERLAY /root/ws_dave/install
+ENV ROS_UNDERLAY /home/$USER/dave_ws/install
 WORKDIR $ROS_UNDERLAY/../src
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
@@ -108,5 +108,8 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" && \
 RUN sed --in-place --expression \
     '$i source "$ROS_UNDERLAY/setup.bash"' /ros_entrypoint.sh
 
+# Set User as user
+USER $USER
+
 # Use software rendering for container
 ENV LIBGL_ALWAYS_INDIRECT=1