From da8c9af37b2aa183499fb8e2bb205633bce92ded Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Thu, 22 Jan 2015 18:30:15 +0100 Subject: [PATCH] fixed some stuff --- Tools/ros/docker/px4-ros/Dockerfile | 4 ++-- Tools/ros/docker/px4-ros/scripts/setup-workspace.sh | 2 +- Tools/ros/vagrant/px4-ros/Vagrantfile | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/ros/docker/px4-ros/Dockerfile b/Tools/ros/docker/px4-ros/Dockerfile index 74291bd14b..4b553fa66e 100644 --- a/Tools/ros/docker/px4-ros/Dockerfile +++ b/Tools/ros/docker/px4-ros/Dockerfile @@ -55,8 +55,8 @@ RUN apt-get -y install ros-indigo-octomap-msgs # Some QT-Apps/Gazebo don't not show controls without this ENV QT_X11_NO_MITSHM 1 -COPY scripts/setup-workspace.sh ~/ -RUN chmod +x ~/setup-workspace.sh +COPY scripts/setup-workspace.sh /root/scripts +RUN chmod +x /root/setup-workspace.sh CMD ["/usr/bin/xterm"] diff --git a/Tools/ros/docker/px4-ros/scripts/setup-workspace.sh b/Tools/ros/docker/px4-ros/scripts/setup-workspace.sh index 6b5ddb0a55..231166e275 100644 --- a/Tools/ros/docker/px4-ros/scripts/setup-workspace.sh +++ b/Tools/ros/docker/px4-ros/scripts/setup-workspace.sh @@ -39,5 +39,5 @@ cd $WORKSPACE/src git clone https://github.com/catkin/catkin_simple.git cd $WORKSPACE -echo "Execute catkin_make to compile all the sources." +catkin_make diff --git a/Tools/ros/vagrant/px4-ros/Vagrantfile b/Tools/ros/vagrant/px4-ros/Vagrantfile index b5169e061a..e54370ada5 100644 --- a/Tools/ros/vagrant/px4-ros/Vagrantfile +++ b/Tools/ros/vagrant/px4-ros/Vagrantfile @@ -18,6 +18,7 @@ # Attention: will loose all data when stopped, vagrant runs this with "--rm" # # TODO +# - do not run the docker container with "--rm" (vagrant default). is that even possible? # - maybe map a local working directory to compile stuff without loosing it in side the docker container #