checkpoint, for tomorrow :(

Author: Edwardius

.devcontainer/Dockerfile

@@ -9,15 +9,17 @@ FROM ros:${ROS_DISTRO}-ros-base AS dev-tools
 # Install development tools not in base image
 RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-pip \
+    python3-venv \
     python3-colcon-common-extensions \
     python3-rosdep \
     openssh-client \
     git \
     curl \
     && rm -rf /var/lib/apt/lists/*
 
-# Install pre-commit
-RUN python3 -m pip install --no-cache-dir pre-commit==3.8.0
+# Create a system-wide virtual environment and install pre-commit
+RUN python3 -m venv --system-site-packages /opt/venv && \
+    /opt/venv/bin/pip install --no-cache-dir pre-commit==3.8.0
 
 # Set working dir (matches VSCode workspace)
 WORKDIR /deep_ros_ws
@@ -58,8 +60,8 @@ ARG ROS_DISTRO
 # Cater image to user
 SHELL ["/bin/bash", "-c"]
 # hadolint ignore=SC2086
-RUN groupadd --gid ${USER_GID} ${USERNAME} \
-    && useradd --uid ${USER_UID} --gid ${USER_GID} -m $USERNAME --shell /bin/bash \
+RUN groupadd --gid ${USER_GID} ${USERNAME} || groupmod -n ${USERNAME} $(getent group ${USER_GID} | cut -d: -f1) \
+    && useradd --uid ${USER_UID} --gid ${USER_GID} -m $USERNAME --shell /bin/bash || usermod -l ${USERNAME} -d /home/${USERNAME} -m $(getent passwd ${USER_UID} | cut -d: -f1) \
     && apt-get update \
     && apt-get install -y --no-install-recommends sudo \
     && echo $USERNAME ALL=\(ALL\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
@@ -76,5 +78,6 @@ USER $USERNAME
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -fsSL https://claude.ai/install.sh | bash
 
-# Source ROS in user's bashrc
-RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/$USERNAME/.bashrc
+# Source ROS and Python venv in user's bashrc
+RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/$USERNAME/.bashrc && \
+    echo "source /opt/venv/bin/activate" >> /home/$USERNAME/.bashrc