diff --git a/Dockerfile b/Dockerfile index 323d264b7742c72a478819aa8e4ed43cfd68d7ea..ac0c96a211e31d9355abe0318085773ad4ef597d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,13 +13,14 @@ RUN apt-get update && apt-get install -y ros-melodic-desktop-full wget nano pyth RUN apt-get install -y \ ros-melodic-libfranka python-catkin-tools libeigen3-dev RUN apt-get install -y python-rosinstall python-rosinstall-generator python-wstool build-essential +RUN apt-get install vim -y RUN rosdep init && rosdep update RUN mkdir -p /root/ws_tmp /root/Desktop && ln -s /usr/share/applications/lxterminal.desktop /root/Desktop/lxterminal.desktop ENV ROS_DISTRO=melodic -RUN /bin/bash -c "echo -e 'source /root/Desktop/ros_ws/devel/setup.bash\n \ - umask 000\n \ +RUN /bin/bash -c "echo -e 'umask 000\n \ + source /opt/ros/melodic/setup.bash\n \ cd /root/Desktop/ros_ws/\n' >> /root/.bashrc " WORKDIR /root/ws_tmp @@ -30,7 +31,6 @@ COPY ./src /root/ws_tmp/src RUN apt-get update && rosdep install --from-paths . -r -y RUN catkin config \ - --extend /opt/ros/melodic && \ - catkin build + --extend /opt/ros/melodic ENV OPENBOX_ARGS --startup "/root/copyws.sh" VOLUME /root/Desktop/ros_ws