From 02937d1a93aab58d5fe6577f9b08cb814e7211e8 Mon Sep 17 00:00:00 2001
From: Thies Lennart Alff <lennart.alff@gmail.com>
Date: Fri, 12 Apr 2024 14:20:34 +0200
Subject: [PATCH] update

---
 Dockerfile         | 9 +++++++++
 build              | 2 +-
 docker-compose.yml | 3 ++-
 entrypoint.sh      | 8 ++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 714772e..ccdcd76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update \
     clang-format \
     xclip \
     wl-clipboard \
+    breeze \
     && mkdir -p /etc/apt/keyrings \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && NODE_MAJOR=20 \
@@ -35,6 +36,13 @@ ENV NVIDIA_DRIVER_CAPABILITIES \
     ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics
 ENV ROS_DISTR=$ROS_DISTR
 
+RUN apt-get update \
+    #&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
+    && apt-get install -y \
+    software-properties-common \
+    && add-apt-repository -y ppa:inivation-ppa/inivation \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
     && apt-get install -y \
@@ -50,6 +58,7 @@ RUN apt-get update \
     iputils-ping \
     sudo \
     wget \
+    libserial-dev \
     ros-${ROS_DISTR}-rqt-tf-tree \
     ros-${ROS_DISTR}-apriltag \
     ros-${ROS_DISTR}-plotjuggler-ros \
diff --git a/build b/build
index e7ad396..ba73f01 100755
--- a/build
+++ b/build
@@ -1,3 +1,3 @@
 #!/usr/bin/bash
 
-docker compose build
+docker compose build --pull
diff --git a/docker-compose.yml b/docker-compose.yml
index 49a03c6..ec212e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   nvidia:
-    container_name: ros2-vim
+    container_name: ros2-vim-nvidia
     extends:
       service: dev
     deploy:
@@ -58,6 +58,7 @@ services:
       - XDG_RUNTIME_DIR=/tmp
       - WAYLAND_DISPLAY=${WAYLAND_DISPLAY}
       - QT_X11_NO_MITSHM=1
+      - QT_STYLE_OVERRIDE=breeze
       - SHELL=/usr/bin/zsh
       - ROS_WORKSPACE=/home/ros-user/uuv/ros2
       - SSH_AUTH_SOCK=/ssh-agent
diff --git a/entrypoint.sh b/entrypoint.sh
index 6f007aa..7c14297 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,8 +3,10 @@ set -e
 WORKSPACE_DIR="\$HOME/uuv/ros2"
 UNDERLAY_DIR="\$HOME/uuv/ros2_underlay"
 
-echo "alias build_ros=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source $UNDERLAY_DIR/install/setup.bash && cd $WORKSPACE_DIR && colcon build --symlink-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'\"" >> ~/.zshrc
-echo "alias build_underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/$ROS_DISTR/setup.bash && cd $UNDERLAY_DIR && colcon build'\"" >> ~/.zshrc
+#echo "alias build_ros=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source $UNDERLAY_DIR/install/setup.bash && cd $WORKSPACE_DIR && colcon build --symlink-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'\"" >> ~/.zshrc
+#echo "alias build_underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/$ROS_DISTR/setup.bash && cd $UNDERLAY_DIR && colcon build'\"" >> ~/.zshrc
+echo "alias rosdep-ros2=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source \$HOME/uuv/ros2_underlay/install/setup.bash && cd \$HOME/uuv/ros2 && rosdep install --from-paths src -y --ignore-src'\"" >> ~/.zshrc
+echo "alias rosdep-underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/iron/setup.bash && cd \$HOME/uuv/ros2_underlay && rosdep install --from-paths src -y --ignore-src'\"" >> ~/.zshrc
 
 
 echo 'source $HOME/uuv/ros2_underlay/install/setup.zsh' >> ~/.zshrc
@@ -12,6 +14,8 @@ echo 'source $HOME/uuv/ros2/install/local_setup.zsh' >> ~/.zshrc
 echo 'export RCUTILS_COLORIZED_OUTPUT=1' >> ~/.zshrc
 echo 'eval "$(register-python-argcomplete3 ros2)"' >> ~/.zshrc
 echo 'eval "$(register-python-argcomplete3 colcon)"' >> ~/.zshrc
+echo 'eval "$(register-python-argcomplete3 build-ros)"' >> ~/.zshrc
+echo 'eval "$(register-python-argcomplete3 clean-ros)"' >> ~/.zshrc
 echo "bindkey '^ ' autosuggest-toggle" >> ~/.zshrc
 
 exec $@