update

zcemycl · Jan 31, 2025 · dd72f63 · dd72f63
1 parent e502801
commit dd72f63
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/containers/docker/ros-simulation/Dockerfile.old b/src/containers/docker/ros-simulation/Dockerfile.old
@@ -1,5 +1,7 @@
 FROM osrf/ros:noetic-desktop-full
 
+SHELL [ "/bin/bash", "-c" ]
+
 ENV NVIDIA_VISIBLE_DEVICES \
     ${NVIDIA_VISIBLE_DEVICES:-all}
 ENV NVIDIA_DRIVER_CAPABILITIES \
@@ -15,6 +17,7 @@ RUN apt-get install ros-noetic-joy ros-noetic-control-toolbox \
     # ros-noetic-ignition-math6-vendor \
     # ignition ignition-launch-cli ignition-tools \
     ros-noetic-gazebo-plugins ros-noetic-rgbd-launch -y
+RUN apt-get install build-essential -y
 WORKDIR /
 RUN mkdir -p catkin_ws/src/
 WORKDIR /catkin_ws/src/
@@ -24,9 +27,11 @@ RUN git clone https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
 RUN echo "export TURTLEBOT3_MODEL=burger" > ~/.bashrc
 RUN echo "source /opt/ros/noetic/setup.bash" > ~/.bashrc
 RUN echo "source /catkin_ws/devel/setup.bash" > ~/.bashrc
-RUN pip install rospkg
-RUN /bin/bash -c 'source /opt/ros/noetic/setup.bash; \
-    cd /catkin_ws/; catkin_make; source /catkin_ws/devel/setup.bash'
+RUN pip3 install rospkg
+
+RUN source /opt/ros/noetic/setup.bash && \
+    cd /catkin_ws/ && \
+    catkin_init_workspace
 # WORKDIR /opt/ros/noetic
 # RUN . setup.bash
 # WORKDIR /catkin_ws

diff --git a/src/containers/docker/ros-simulation/run_algo.sh b/src/containers/docker/ros-simulation/run_algo.sh
diff --git a/src/containers/docker/ros-simulation/run_gazebo.sh b/src/containers/docker/ros-simulation/run_gazebo.sh
diff --git a/src/containers/docker/ros-simulation/run_rviz.sh b/src/containers/docker/ros-simulation/run_rviz.sh