From 091dc3a0528874d03f05a32a01241d065976bca0 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Sat, 22 Jun 2024 20:58:00 +0200 Subject: [PATCH] Set ENV variable from the start --- docker/Dockerfile | 4 +++- ...e_fastrtps_interface_restriction.sh => init_fastrtps.sh} | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) rename docker/{create_fastrtps_interface_restriction.sh => init_fastrtps.sh} (90%) diff --git a/docker/Dockerfile b/docker/Dockerfile index fd5b336..fa38d47 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && \ nmap \ inetutils-ping \ iproute2 \ + net-tools \ && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -48,6 +49,7 @@ RUN mkdir -p /opt/colcon_ws/src WORKDIR /opt/colcon_ws/src ENV RMW_IMPLEMENTATION=rmw_fastrtps_cpp +ENV FASTRTPS_DEFAULT_PROFILES_FILE=/opt/colcon_ws/fastrtps_interface_restriction.xml RUN git clone --recursive --depth 1 https://github.com/aentinger/msas_enrich_2023 --branch elrob24 && cd msas_enrich_2023 && git pull origin elrob24 RUN git clone --recursive --depth 1 https://github.com/107-systems/t07_robot --branch elrob24 && cd t07_robot && git pull origin elrob24 @@ -56,7 +58,7 @@ RUN git clone --recursive --depth 1 https://github.com/107-systems/robotem_rovne WORKDIR /opt/colcon_ws -COPY create_fastrtps_interface_restriction.sh /opt/colcon_ws +COPY init_fastrtps.sh /opt/colcon_ws RUN . /opt/ros/humble/setup.sh && \ colcon build --packages-select mandeye_unicorn t07_robot pika_spark_bno085_driver robotem_rovne --cmake-args -DCMAKE_BUILD_TYPE=Release diff --git a/docker/create_fastrtps_interface_restriction.sh b/docker/init_fastrtps.sh similarity index 90% rename from docker/create_fastrtps_interface_restriction.sh rename to docker/init_fastrtps.sh index 6580087..d3a6170 100755 --- a/docker/create_fastrtps_interface_restriction.sh +++ b/docker/init_fastrtps.sh @@ -45,9 +45,3 @@ echo " " > /opt/colcon_ws/fastrtps_interface_restriction.xml - -# tell where to look -export FASTRTPS_DEFAULT_PROFILES_FILE=/opt/colcon_ws/fastrtps_interface_restriction.xml - -# we probably do not want to limit to localhost -unset ROS_LOCALHOST_ONLY