Merge pull request #22 from graziegrazie/docker

Do you add ros-${ROS_DISTRO}-moveit, and modify docker-compose.yml to use ROS1 melodic?

Dockerfile

@@ -7,7 +7,7 @@ FROM ${BASE_IMAGE}
 # (or without GPU) works through docker.
 # I was unable to use the ROS_DISTRO variable here due to this issue:
 # https://github.com/docker/for-mac/issues/2155
-COPY --from=osrf/ros:kinetic-desktop-full / /
+COPY --from=osrf/ros:melodic-desktop-full / /
 
 # Add ROS env vars to the bashrc
 ENV BASH_ENV="/root/launch.sh"
@@ -16,6 +16,10 @@ ENTRYPOINT ["/bin/bash", "-c"]
 ARG ROS_DISTRO
 RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> $BASH_ENV
 
+# Copy myCobot ROS package
+WORKDIR /catkin_ws/src
+COPY . mycobot_ros
+
 # Install build dependencies
 RUN apt-get update && \
     apt-get install -y \
@@ -24,10 +28,9 @@ RUN apt-get update && \
         python-rosinstall-generator \
         python-wstool \
         build-essential \
-        # Project-specific build dependencies
-        python-pip \
-        ros-${ROS_DISTRO}-serial \
-        ros-${ROS_DISTRO}-joint-state-publisher-gui && \
+        python-pip && \
+    # Project-specific build dependencies
+    rosdep install -r -y -i --from-paths . && \
     rm -rf /var/lib/apt/lists/*
 
 # Install python dependencies
@@ -35,8 +38,6 @@ ARG PYMYCOBOT_VERSION
 RUN pip install "pymycobot $PYMYCOBOT_VERSION" --user
 
 # Build the project
-WORKDIR /catkin_ws/src
-ADD . mycobot_ros
 WORKDIR /catkin_ws
 RUN catkin_make
 

docker-compose.yml

@@ -12,7 +12,7 @@ x-app: &common
   build:
     context: .
     args: &common-args
-      ROS_DISTRO: "kinetic"
+      ROS_DISTRO: "melodic"
       PYMYCOBOT_VERSION: ">=2<3"
       BASE_IMAGE: nvidia/opengl:1.1-glvnd-runtime-ubuntu18.04