Skip to content

Commit

Permalink
include ros-base and rviz in scancontrol-base image
Browse files Browse the repository at this point in the history
  • Loading branch information
dave992 committed Nov 22, 2024
1 parent 131886e commit ad87e9f
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit ad87e9f

Please sign in to comment.