Some refactoring of models into base

cmu-mars · Oct 13, 2017 · 795d58e · 795d58e
1 parent 4c9913a
commit 795d58e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -35,8 +35,16 @@ ENV CP_MAPS_REV 80afb8f
 RUN git clone https://github.com/cmu-mars/cp-maps-p15 src/maps && \
     cd src/maps && \
     git reset --hard "${CP_MAPS_REV}"
+
+# install shared "models" module
+ENV MARS_MODELS_REVISION 5dd3542
+RUN git clone https://github.com/cmu-mars/cp-models-p15 \
+              src/cp-models-p15 && \
+    cd src/cp-models-p15 && \
+    git checkout "${MARS_MODELS_REVISION}"
 
 # add the entrypoint script
 ADD entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/home/mars/catkin_ws/entrypoint.sh"]
+
 CMD ["/bin/bash"]
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd /home/mars/catkin_ws
 source "/opt/ros/${ROS_DISTRO}/setup.bash"
 source devel/setup.bash