From 35ce64f3b4aa8fd1bbafeb5bda2e70b69d81eda1 Mon Sep 17 00:00:00 2001 From: Enric Cervera Date: Wed, 6 Jun 2018 13:10:55 +0200 Subject: [PATCH 1/5] Change travis repo --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index a9a85709..553f4189 100644 --- a/Readme.md +++ b/Readme.md @@ -2,7 +2,7 @@ ***Collaborative System for Task Automation and Recognition*** -[![Build Status](https://travis-ci.org/cpaxton/costar_stack.svg?branch=master)](https://travis-ci.org/cpaxton/costar_stack) +[![Build Status](https://travis-ci.org/ICRA2017/costar_stack.svg?branch=reproducible)](https://travis-ci.org/ICRA2017/costar_stack) CoSTAR is an end-user interface for authoring robot task plans developed at Johns Hopkins University. It includes integrated perception and planning capabilities, plus a Behavior Tree based user interface. From 095b45ab00acc1a12997692fd859c3d68238dd5e Mon Sep 17 00:00:00 2001 From: Enric Cervera Date: Wed, 6 Jun 2018 13:14:11 +0200 Subject: [PATCH 2/5] Update Readme.md --- Readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Readme.md b/Readme.md index 553f4189..09ad65c8 100644 --- a/Readme.md +++ b/Readme.md @@ -100,3 +100,5 @@ CoSTAR is maintained by Chris Paxton (cpaxton@jhu.edu). Other core contributors include: * Felix Jonathan * Andrew Hundt + +## Run in Docker From ff8d619e60d9c2598e76d7fc4de70c6046be2b72 Mon Sep 17 00:00:00 2001 From: Enric Cervera Date: Wed, 6 Jun 2018 15:09:52 +0200 Subject: [PATCH 3/5] fix package dependencies --- Dockerfile | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..5a6fdca4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,30 @@ +FROM ros:indigo + +RUN apt-get update && apt-get install -y \ + python-catkin-pkg python-rosdep python-wstool \ + python-catkin-tools ros-indigo-catkin \ + && rm -rf /var/lib/apt/lists + +ENV CATKIN_WS=/root/catkin_ws +RUN rm /bin/sh \ + && ln -s /bin/bash /bin/sh + +RUN source /ros_entrypoint.sh \ + && mkdir -p $CATKIN_WS/src \ + && cd $CATKIN_WS/src \ + && catkin_init_workspace \ + && git clone https://github.com/ICRA2017/costar_stack.git \ + && git clone https://github.com/SalvoVirga/iiwa_stack.git \ + && git clone https://github.com/ros-industrial/robotiq.git \ + && git clone https://github.com/jbohren/rqt_dot.git \ + && git clone https://github.com/sniekum/ar_track_alvar.git \ + && git clone https://github.com/sniekum/ar_track_alvar_msgs.git \ + && git clone https://github.com/gt-ros-pkg/hrl-kdl.git \ + && git clone https://github.com/xqms/ur_modern_driver.git --branch thread_safety \ + && git clone https://github.com/jhu-lcsr/ObjRecRANSAC.git + +RUN source /ros_entrypoint.sh \ + && apt-get update \ + && cd $CATKIN_WS/src \ + && rosdep install -y --from-paths ./ --ignore-src --rosdistro indigo + From 098ae71c71a1c56e9f4f25ee95c1d1d381b6e2f7 Mon Sep 17 00:00:00 2001 From: Enric Cervera Date: Wed, 6 Jun 2018 15:38:00 +0200 Subject: [PATCH 4/5] cleaned dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5a6fdca4..40f6195b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,3 +28,7 @@ RUN source /ros_entrypoint.sh \ && cd $CATKIN_WS/src \ && rosdep install -y --from-paths ./ --ignore-src --rosdistro indigo +RUN source /ros_entrypoint.sh \ + && cd $CATKIN_WS \ + && catkin build + \ No newline at end of file From 942fa78bccbc7120fab34b5577c9135aa550def9 Mon Sep 17 00:00:00 2001 From: Enric Cervera Date: Thu, 21 Jun 2018 13:09:19 +0200 Subject: [PATCH 5/5] update dockerfile --- Dockerfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 40f6195b..1bd17a0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,9 @@ RUN rm /bin/sh \ RUN source /ros_entrypoint.sh \ && mkdir -p $CATKIN_WS/src \ + && cd $CATKIN_WS \ + && catkin init \ && cd $CATKIN_WS/src \ - && catkin_init_workspace \ && git clone https://github.com/ICRA2017/costar_stack.git \ && git clone https://github.com/SalvoVirga/iiwa_stack.git \ && git clone https://github.com/ros-industrial/robotiq.git \ @@ -23,6 +24,18 @@ RUN source /ros_entrypoint.sh \ && git clone https://github.com/xqms/ur_modern_driver.git --branch thread_safety \ && git clone https://github.com/jhu-lcsr/ObjRecRANSAC.git +RUN apt-get update && apt-get install -y \ + software-properties-common \ + && rm -rf /var/lib/apt/lists + +RUN add-apt-repository --yes ppa:v-launchpad-jochen-sprickerhof-de/pcl \ + && apt-get update && apt-get install -y libpcl-all \ + && rm -rf /var/lib/apt/lists + +RUN add-apt-repository --yes ppa:xqms/opencv-nonfree \ + && apt-get update && apt-get install -y libopencv-nonfree-dev \ + && rm -rf /var/lib/apt/lists + RUN source /ros_entrypoint.sh \ && apt-get update \ && cd $CATKIN_WS/src \