Cuda-dev update for multibeam sonar plugin

kinetic/Dockerfile

@@ -9,7 +9,7 @@ ARG DIST=kinetic
 # Set Gazebo verison
 ARG GAZ=gazebo7
 
-# Required utilities 
+# Required utilities
 RUN apt update \
  && apt install -y --no-install-recommends \
  build-essential \
@@ -82,15 +82,18 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" >
  ros-${DIST}-velodyne-gazebo-plugins \
  ros-${DIST}-velodyne-simulator \
  ros-${DIST}-xacro \
+ ros-${DIST}-pcl-ros \
+ ros-${DIST}-image-view \
  && apt clean
 
-RUN apt install -y --no-install-recommends python3-numpy 
+RUN apt install -y --no-install-recommends python3-numpy
 
 # Optional: Dev. tools, applications, etc.
 RUN apt-get update && apt-get install -y --no-install-recommends \
  gdb \
  psmisc \
  vim \
+ x11-apps \
  && rm -rf /var/lib/apt/lists/*
 
 ## Customize your image here.

melodic/Dockerfile

@@ -9,7 +9,7 @@ ARG DIST=melodic
 # Set Gazebo verison
 ARG GAZ=gazebo9
 
-# Required utilities 
+# Required utilities
 RUN apt update \
  && apt install -y --no-install-recommends \
  build-essential \
@@ -82,6 +82,8 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" >
  ros-${DIST}-velodyne-gazebo-plugins \
  ros-${DIST}-velodyne-simulator \
  ros-${DIST}-xacro \
+ ros-${DIST}-pcl-ros \
+ ros-${DIST}-image-view \
  && apt clean
 
 RUN pip3 install numpy

noetic/Dockerfile

@@ -56,6 +56,7 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" >
  python3-rosinstall \
  python3-rosinstall-generator \
  python3-vcstool \
+ catkin-lint \
  ros-${DIST}-gazebo-plugins \
  ros-${DIST}-gazebo-ros \
  ros-${DIST}-gazebo-ros-control \
@@ -86,8 +87,13 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" >
  ros-${DIST}-velodyne-gazebo-plugins \
  ros-${DIST}-velodyne-simulator \
  ros-${DIST}-xacro \
+ ros-${DIST}-pcl-ros \
+ ros-${DIST}-image-view \
  && apt clean
 
+# Fix rqt_image_viewer pyqt5 problem
+RUN python3 -m pip uninstall pyqt5 pyqt5-sip
+
 # Optional: Dev. tools, applications, etc.
 RUN apt-get update && apt-get install -y --no-install-recommends \
  gdb \

run.bash

@@ -48,16 +48,16 @@ ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git"
 
 while getopts ":csth" option; do
  case $option in
- c) # enable cuda library support 
- CUDA="--cuda ";;
+ c) # enable cuda library support
+ CUDA="--cuda";;
  s) # Build cloudsim image
  ROCKER_ARGS="--nvidia --novnc --turbovnc --user --user-override-name=developer";;
- t) # Build test image for Continuous Integration 
+ t) # Build test image for Continuous Integration
  echo "Building CI image"
  ROCKER_ARGS="--dev-helpers --nvidia --user --user-override-name=developer";;
  h) # print this help message and exit
  Help
- exit;; 
+ exit;;
  esac
 done
 
@@ -69,4 +69,4 @@ CONTAINER_NAME="${NAMES[0]}_runtime"
 ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
 echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
 
-rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME 
+rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME