|
@@ -90,25 +90,25 @@ RUN sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_re
|
|
&& curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
|
|
&& curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
|
|
|
|
|
|
RUN apt-get update && apt-get install -y \
|
|
RUN apt-get update && apt-get install -y \
|
|
- ros-humble-ackermann-msgs \
|
|
|
|
- ros-humble-control-toolbox \
|
|
|
|
- ros-humble-gazebo-msgs \
|
|
|
|
- ros-humble-joy \
|
|
|
|
- ros-humble-navigation2 \
|
|
|
|
- ros-humble-rviz2 \
|
|
|
|
- ros-humble-tf2-ros \
|
|
|
|
- ros-humble-urdfdom \
|
|
|
|
- ros-humble-vision-msgs \
|
|
|
|
|
|
+ ros-${ROS_DISTRO}-ackermann-msgs \
|
|
|
|
+ ros-${ROS_DISTRO}-control-toolbox \
|
|
|
|
+ ros-${ROS_DISTRO}-gazebo-msgs \
|
|
|
|
+ ros-${ROS_DISTRO}-joy \
|
|
|
|
+ ros-${ROS_DISTRO}-navigation2 \
|
|
|
|
+ ros-${ROS_DISTRO}-rviz2 \
|
|
|
|
+ ros-${ROS_DISTRO}-tf2-ros \
|
|
|
|
+ ros-${ROS_DISTRO}-urdfdom \
|
|
|
|
+ ros-${ROS_DISTRO}-vision-msgs \
|
|
python3-colcon-common-extensions \
|
|
python3-colcon-common-extensions \
|
|
- ros-humble-cyclonedds \
|
|
|
|
- ros-humble-rmw-cyclonedds-cpp \
|
|
|
|
- ros-humble-slam-toolbox \
|
|
|
|
- ros-humble-navigation2 \
|
|
|
|
- ros-humble-nav2-bringup \
|
|
|
|
- ros-humble-pointcloud-to-laserscan \
|
|
|
|
- ros-humble-teleop-twist-keyboard \
|
|
|
|
- ros-humble-ackermann-msgs \
|
|
|
|
- ros-humble-topic-tools \
|
|
|
|
|
|
+ ros-${ROS_DISTRO}-cyclonedds \
|
|
|
|
+ ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
|
|
|
|
+ ros-${ROS_DISTRO}-slam-toolbox \
|
|
|
|
+ ros-${ROS_DISTRO}-navigation2 \
|
|
|
|
+ ros-${ROS_DISTRO}-nav2-bringup \
|
|
|
|
+ ros-${ROS_DISTRO}-pointcloud-to-laserscan \
|
|
|
|
+ ros-${ROS_DISTRO}-teleop-twist-keyboard \
|
|
|
|
+ ros-${ROS_DISTRO}-ackermann-msgs \
|
|
|
|
+ ros-${ROS_DISTRO}-topic-tools \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& pip install python-statemachine
|
|
&& pip install python-statemachine
|
|
|
|
|
|
@@ -128,7 +128,7 @@ RUN if [ "${IMAGE_TYPE}" = "full" ]; then \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs install \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs install \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs pull \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs pull \
|
|
&& $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/ROSConDemo/Project \
|
|
&& $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/ROSConDemo/Project \
|
|
- && . /opt/ros/humble/setup.sh \
|
|
|
|
|
|
+ && . /opt/ros/${ROS_DISTRO}/setup.sh \
|
|
&& cd $WORKSPACE/ROSConDemo/Project \
|
|
&& cd $WORKSPACE/ROSConDemo/Project \
|
|
&& cmake -B $WORKSPACE/ROSConDemo/Project/build/linux -S . -G "Ninja Multi-Config" -DLY_DISABLE_TEST_MODULES=ON -DLY_STRIP_DEBUG_SYMBOLS=ON \
|
|
&& cmake -B $WORKSPACE/ROSConDemo/Project/build/linux -S . -G "Ninja Multi-Config" -DLY_DISABLE_TEST_MODULES=ON -DLY_STRIP_DEBUG_SYMBOLS=ON \
|
|
&& cmake --build $WORKSPACE/ROSConDemo/Project/build/linux --config profile --target ROSConDemo.GameLauncher Editor ROSConDemo.Assets -j $CMAKE_JOBS \
|
|
&& cmake --build $WORKSPACE/ROSConDemo/Project/build/linux --config profile --target ROSConDemo.GameLauncher Editor ROSConDemo.Assets -j $CMAKE_JOBS \
|
|
@@ -163,7 +163,7 @@ RUN if [ "${IMAGE_TYPE}" = "full" ]; then \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs install \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs install \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs pull \
|
|
&& git -C $WORKSPACE/ROSConDemo lfs pull \
|
|
&& $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/ROSConDemo/Project \
|
|
&& $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/ROSConDemo/Project \
|
|
- && . /opt/ros/humble/setup.sh \
|
|
|
|
|
|
+ && . /opt/ros/${ROS_DISTRO}/setup.sh \
|
|
&& cd $WORKSPACE/ROSConDemo/Project \
|
|
&& cd $WORKSPACE/ROSConDemo/Project \
|
|
&& cmake -B $WORKSPACE/ROSConDemo/Project/build/linux -S . -G "Ninja Multi-Config" -DLY_DISABLE_TEST_MODULES=ON -DLY_STRIP_DEBUG_SYMBOLS=ON \
|
|
&& cmake -B $WORKSPACE/ROSConDemo/Project/build/linux -S . -G "Ninja Multi-Config" -DLY_DISABLE_TEST_MODULES=ON -DLY_STRIP_DEBUG_SYMBOLS=ON \
|
|
&& cmake --build $WORKSPACE/ROSConDemo/Project/build/linux --config profile --target ROSConDemo.GameLauncher ROSConDemo.Assets -j $CMAKE_JOBS \
|
|
&& cmake --build $WORKSPACE/ROSConDemo/Project/build/linux --config profile --target ROSConDemo.GameLauncher ROSConDemo.Assets -j $CMAKE_JOBS \
|
|
@@ -218,12 +218,16 @@ RUN echo "[Unit]" > /etc/systemd/system/setup_ros.service \
|
|
&& echo "After=network.target" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "After=network.target" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "[Service]" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "[Service]" >> /etc/systemd/system/setup_ros.service \
|
|
- && echo "ExecStart=/opt/ros/humble/setup.bash" >> /etc/systemd/system/setup_ros.service \
|
|
|
|
|
|
+ && if [ "${ROS_DISTRO}" = "humble" ]; then \
|
|
|
|
+ echo "ExecStart=/opt/ros/humble/setup.bash" >> /etc/systemd/system/setup_ros.service; \
|
|
|
|
+ elif [ "${ROS_DISTRO}" = "galactic" ]; then \
|
|
|
|
+ echo "ExecStart=/opt/ros/galactic/setup.bash" >> /etc/systemd/system/setup_ros.service; \
|
|
|
|
+ fi \
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "[Install]" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "[Install]" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "WantedBy=default.target" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "WantedBy=default.target" >> /etc/systemd/system/setup_ros.service \
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service
|
|
&& echo "" >> /etc/systemd/system/setup_ros.service
|
|
|
|
|
|
-
|
|
|
|
ENV NVIDIA_VISIBLE_DEVICES all
|
|
ENV NVIDIA_VISIBLE_DEVICES all
|
|
ENV NVIDIA_DRIVER_CAPABILITIES all
|
|
ENV NVIDIA_DRIVER_CAPABILITIES all
|
|
|
|
+
|