Merge branch 'master' of http://git.caslab.ece.vt.edu/hlarkin3/ros-kubernetes

docker/yolo/Dockerfile

@@ -36,7 +36,10 @@ RUN apt-get install -y python-rosdep python-rosinstall python-rosinstall-generat
 RUN mkdir -p catkin_ws/src && mkdir -p /tmp/darknetMemories
 # darknet ros package install
 COPY ./yolov4-for-darknet_ros /catkin_ws/src/darknet_package
-# build the enclosed darknet installation
+
+# copy over environment file to allow remote roslaunch
+COPY ./dorknet_kube_env.sh /opt/ros/melodic/dorknet_kube_env.sh
+
 
 # install random pip thing and run catkin_make
 RUN /bin/bash -c '. /opt/ros/melodic/setup.bash && cd catkin_ws && catkin_make'

docker/yolo/dorknet_kube_env.sh

+#!/bin/bash
+export ROS_WS=/catkin_ws
+source $ROS_WS/devel/setup.bash
+export PATH=$ROS_ROOT/bin:$PATH
+export ROS_PACKAGE_PATH=$ROS_PACKAGE_PATH:$ROS_WS
+export ROS_MASTER_URI=http://service-master:11311
+export ROS_HOSTNAME=service-dorknet
+export ROS_LOG_DIR=/root/.ros/log
+exec "$@"