Merge branch 'develop'

bin/benchbot_run

@@ -179,6 +179,7 @@ function exit_gracefully() {
     close_network $network_forwarding $network_policy
   fi
   kill_benchbot
+  xhost -local:root > /dev/null
   exit ${exit_code:-0}
 }
 
@@ -360,7 +361,6 @@ ${cmd// /$'\t'} --ip "$URL_SUPERVISOR" -d $DOCKER_TAG_BACKEND /bin/bash -c \
 echo -e "\n${colour_blue}Starting container for BenchBot Debugging:${colour_nc}"
 cmd="${docker_run//'$name'/benchbot_debug}"
 ${cmd// /$'\t'} --ip "$URL_DEBUG" -it -d $DOCKER_TAG_BACKEND /bin/bash
-xhost -local:root > /dev/null
 
 # Print the output of the Supervisor, watching for failures
 header_block "BENCHBOT IS RUNNING (Ctrl^C to exit) ..." ${colour_green}
@@ -372,6 +372,7 @@ while [ -n "$(docker ps -q -f 'name=benchbot_supervisor')" ] && \
   [ -n "$(docker ps -q -f 'name=benchbot_robot')" ]); do
   sleep 1
 done
+# sleep infinity
 
 if [ -n "$simulator_required" ] && \
     [ -z "$(docker ps -q -f 'name=benchbot_robot')" ]; then

docker/shared_tools.Dockerfile

@@ -38,7 +38,7 @@ ENV BENCHBOT_CONTROLLER_PATH="$BENCHBOT_DIR/benchbot_robot_controller"
 RUN git clone $BENCHBOT_CONTROLLER_GIT $BENCHBOT_CONTROLLER_PATH && \
     pushd $BENCHBOT_CONTROLLER_PATH && git checkout $BENCHBOT_CONTROLLER_HASH && \
     pip install -r requirements.txt && pushd $ROS_WS_PATH && \
-    pushd src && git clone https://github.com/eric-wieser/ros_numpy.git && popd && \
+    pushd src && git clone https://github.com/eric-wieser/ros_numpy && popd && \
     ln -sv $BENCHBOT_CONTROLLER_PATH src/ && source devel/setup.bash && catkin_make
 
 # Create a place to mount our add-ons, & install manager dependencies