Skip to content
Snippets Groups Projects
Commit caa0bcf3 authored by Montaño Sarria, Andres Felipe's avatar Montaño Sarria, Andres Felipe
Browse files

Extend to ROS humble

parent ae942b62
No related branches found
No related tags found
No related merge requests found
...@@ -46,14 +46,18 @@ RUN apt-get update && apt-get -y install --no-install-recommends \ ...@@ -46,14 +46,18 @@ RUN apt-get update && apt-get -y install --no-install-recommends \
valgrind \ valgrind \
xterm \ xterm \
wget \ wget \
zsh \ zsh
#
RUN if [ "${ROS_DISTRO}" != "humble" ]; \
then \
apt-get -y install \
ros-${ROS_DISTRO}-catkin \ ros-${ROS_DISTRO}-catkin \
ros-${ROS_DISTRO}-plotjuggler \ ros-${ROS_DISTRO}-plotjuggler \
ros-${ROS_DISTRO}-plotjuggler-ros \ ros-${ROS_DISTRO}-plotjuggler-ros \
ros-${ROS_DISTRO}-rosmon \ ros-${ROS_DISTRO}-rosmon \
ros-${ROS_DISTRO}-rqt-controller-manager \ ros-${ROS_DISTRO}-rqt-controller-manager \
ros-${ROS_DISTRO}-rqt-joint-trajectory-controller ros-${ROS_DISTRO}-rqt-joint-trajectory-controller; \
fi
RUN if [ "${ROS_DISTRO}" = "noetic" ]; \ RUN if [ "${ROS_DISTRO}" = "noetic" ]; \
then \ then \
...@@ -109,8 +113,10 @@ RUN apt-get install -y \ ...@@ -109,8 +113,10 @@ RUN apt-get install -y \
RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash \ RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash \
&& apt-get install -y nodejs && npm -g install yarn && apt-get install -y nodejs && npm -g install yarn
# ROS WS dependencies # ROS 1 WS dependencies
RUN apt-get update && apt-get install -y \ RUN if [ "${ROS_DISTRO}" != "humble" ]; \
then \
apt-get -y install \
cython \ cython \
libceres-dev \ libceres-dev \
libcomedi-dev \ libcomedi-dev \
...@@ -119,7 +125,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -119,7 +125,6 @@ RUN apt-get update && apt-get install -y \
python-numpy \ python-numpy \
python3-mock \ python3-mock \
socat \ socat \
# ROS Distro packages
ros-${ROS_DISTRO}-ackermann-msgs \ ros-${ROS_DISTRO}-ackermann-msgs \
ros-${ROS_DISTRO}-amcl \ ros-${ROS_DISTRO}-amcl \
ros-${ROS_DISTRO}-cartesian-trajectory-controller \ ros-${ROS_DISTRO}-cartesian-trajectory-controller \
...@@ -180,7 +185,8 @@ RUN apt-get update && apt-get install -y \ ...@@ -180,7 +185,8 @@ RUN apt-get update && apt-get install -y \
ros-${ROS_DISTRO}-ur-msgs \ ros-${ROS_DISTRO}-ur-msgs \
ros-${ROS_DISTRO}-usb-cam \ ros-${ROS_DISTRO}-usb-cam \
ros-${ROS_DISTRO}-velocity-controllers \ ros-${ROS_DISTRO}-velocity-controllers \
ros-${ROS_DISTRO}-warehouse-ros-mongo ros-${ROS_DISTRO}-warehouse-ros-mongo; \
fi
RUN if [ "${ROS_DISTRO}" = "noetic" ]; \ RUN if [ "${ROS_DISTRO}" = "noetic" ]; \
then \ then \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment