File tree Expand file tree Collapse file tree 2 files changed +11
-7
lines changed
Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -22,6 +22,10 @@ ARG MODEL_DIR=models
2222
2323ADD ibpc_interfaces /opt/ros/underlay/src/ibpc_interfaces
2424
25+ # Install rmw_zenoh pinned at 0.2.3 from source.
26+ RUN cd /opt/ros/underlay/src/ \
27+ && git clone https://github.com/ros2/rmw_zenoh && cd rmw_zenoh && git checkout 0.2.3 && cd ../../
28+
2529RUN . /opt/ros/jazzy/setup.sh \
2630 && apt-get update \
2731 && rosdep update \
@@ -38,7 +42,7 @@ ARG SERVICE_PACKAGE=ibpc_pose_estimator_py
3842ARG SERVICE_EXECUTABLE_NAME=ibpc_pose_estimator
3943
4044RUN apt-get update \
41- && apt install -y ros-jazzy-rmw-zenoh-cpp \
45+ && apt install -y \
4246 && rm -rf /var/lib/apt/lists/*
4347
4448ADD ${SERVICE_PACKAGE} /opt/ros/overlay/src/${SERVICE_PACKAGE}
@@ -59,7 +63,7 @@ ARG SERVICE_EXECUTABLE_NAME=ibpc_pose_estimator
5963
6064RUN apt-get update \
6165 && apt upgrade -y \
62- && apt install -y ros-jazzy-rmw-zenoh-cpp python3-imageio python3-png python3-pip python3-scipy \
66+ && apt install -y python3-imageio python3-png python3-pip python3-scipy \
6367 && rm -rf /var/lib/apt/lists/*
6468
6569COPY --from=overlay /opt/ros/underlay/install /opt/ros/underlay/install
Original file line number Diff line number Diff line change @@ -12,6 +12,10 @@ FROM base AS underlay
1212
1313ADD ibpc_interfaces /opt/ros/underlay/src/ibpc_interfaces
1414
15+ # Install rmw_zenoh pinned at 0.2.3 from source.
16+ RUN cd /opt/ros/underlay/src/ \
17+ && git clone https://github.com/ros2/rmw_zenoh && cd rmw_zenoh && git checkout 0.2.3 && cd ../../
18+
1519RUN . /opt/ros/jazzy/setup.sh \
1620 && apt-get update \
1721 && rosdep update \
@@ -22,10 +26,6 @@ RUN . /opt/ros/jazzy/setup.sh \
2226
2327FROM underlay AS overlay
2428
25- RUN apt-get update \
26- && apt install -y ros-jazzy-rmw-zenoh-cpp \
27- && rm -rf /var/lib/apt/lists/*
28-
2929ADD ibpc_tester /opt/ros/overlay/src/ibpc_tester
3030
3131RUN . /opt/ros/jazzy/setup.sh \
@@ -43,7 +43,7 @@ FROM base
4343
4444RUN apt-get update \
4545 && apt upgrade -y \
46- && apt install -y ros-jazzy-rmw-zenoh-cpp python3-imageio python3-pandas python3-png python3-pip python3-scipy \
46+ && apt install -y python3-imageio python3-pandas python3-png python3-pip python3-scipy \
4747 && rm -rf /var/lib/apt/lists/*
4848
4949# TODO remove deprecated pytz usage
You can’t perform that action at this time.
0 commit comments