From a036806572003d8e78a64fe386416a60ae753510 Mon Sep 17 00:00:00 2001 From: Daisuke Sato Date: Sat, 22 May 2021 18:43:59 +0900 Subject: [PATCH] Use rosdep --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fd610d..869be7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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,11 +28,9 @@ RUN apt-get update && \ python-rosinstall-generator \ python-wstool \ build-essential \ - # Project-specific build dependencies - python-pip \ - ros-${ROS_DISTRO}-moveit \ - 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 @@ -36,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