From ad87e9f9b99963dca42a4e9d62d99c6266b6a0ff Mon Sep 17 00:00:00 2001
From: Dave Kroezen <d.kroezen@tudelft.nl>
Date: Fri, 22 Nov 2024 10:53:05 +0100
Subject: [PATCH] include ros-base and rviz in scancontrol-base image

---
 .docker/Dockerfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8b1c689..cd88405 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -91,7 +91,7 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 ################################################################################
-# ros-core and Aravis + scanCONTROL SDK + non-root user
+# ros-base + Aravis + scanCONTROL SDK + non-root user + Rviz2
 #   for use as a base image in development or deployment
 ################################################################################
 FROM scancontrol-core AS scancontrol-base
@@ -111,17 +111,25 @@ RUN groupadd --gid ${USER_GID} ${USERNAME} \
     && rm -rf /var/lib/apt/lists/*
 
 # Set up autocompletion for user
-RUN apt-get update && apt-get install -y git-core bash-completion \
+RUN apt-get update && apt-get install -y \
+      git-core \
+      bash-completion \
     && echo "if [ -f /opt/ros/${ROS_DISTRO}/setup.bash ]; then source /opt/ros/${ROS_DISTRO}/setup.bash; fi" >> /home/${USERNAME}/.bashrc \
     && echo "if [ -f /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash ]; then source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash; fi" >> /home/$USERNAME/.bashrc \
     && rm -rf /var/lib/apt/lists/* 
 
-# Switch to the ROS_USER for the remaining instructions
+# Switch to the USERNAME for the remaining instructions
 USER $USERNAME
 
+# Install the base release + rviz2
+RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+      ros-humble-ros-base \
+      ros-humble-rviz2 \
+      ros-humble-rviz-default-plugins \
+    && sudo rm -rf /var/lib/apt/lists/*
+
 ################################################################################
 # ros-desktop and Aravis + scanCONTROL SDK + non-root user
-#   for use as a base image in development
 ################################################################################
 FROM scancontrol-base AS scancontrol-dev