diff --git a/docker/Dockerfile b/docker/Dockerfile index fcb296baa785f38348ff55cc799d4189b8be0821..896df18cf944db3e5f47f1b93dbd3b3044024e36 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -72,6 +72,8 @@ WORKDIR ${HOME}/work_dir RUN echo "Cloning modules!" +RUN ls -l + RUN git clone --recurse-submodules -b ga-demo https://git-st.inf.tu-dresden.de/ceti/ros/ccf/ccf_workspace.git RUN echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc diff --git a/docker/launch.sh b/docker/launch.sh index fb5574383351582cab90a7f92c73494518714091..164155c0ea11ca810fbdfc7e4f61e1e11d54dc75 100755 --- a/docker/launch.sh +++ b/docker/launch.sh @@ -7,5 +7,5 @@ if [ $1 -eq 1 ] then roslaunch ccf_immersive_sorting main_controller_virtual_preview_ceti-table-$1_real_robot.launch mqtt_server:=tcp://$2 connection_address:=tcp://$3 robot_ip:=$4 else -roslaunch robot-cell_ceti-table-$1.launch mqtt_server:=tcp://$2 robot_ip:=$4 +roslaunch ccf_immersive_sorting robot-cell_ceti-table-$1.launch mqtt_server:=tcp://$2 robot_ip:=$4 fi diff --git a/src/ccf_immersive_sorting b/src/ccf_immersive_sorting index 00a1a4785fc2f2b5f0e101886fcc5a466346e746..8b9b710f67e2f5a0b67154380ce978d0afe45bda 160000 --- a/src/ccf_immersive_sorting +++ b/src/ccf_immersive_sorting @@ -1 +1 @@ -Subproject commit 00a1a4785fc2f2b5f0e101886fcc5a466346e746 +Subproject commit 8b9b710f67e2f5a0b67154380ce978d0afe45bda