Skip to content

Commit 5e58ac8

Browse files
Merge pull request #182 from NVIDIA-ISAAC-ROS/release-3.2
Update dependencies
2 parents e641adc + 52bc567 commit 5e58ac8

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

docker/Dockerfile.base

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,10 @@ RUN python3 -m pip install -U \
180180
tqdm \
181181
trimesh \
182182
"warp-lang>=0.9.0" \
183-
"yourdfpy>=0.0.53"
183+
"yourdfpy>=0.0.53" \
184+
opentelemetry-api==1.28.1 \
185+
opentelemetry-sdk==1.28.1 \
186+
opentelemetry-exporter-otlp
184187

185188
# Add MQTT binaries and libraries
186189
RUN --mount=type=cache,target=/var/cache/apt \
@@ -476,3 +479,7 @@ COPY middleware_profile[s]/*profile.xml /usr/local/share/middleware_profiles/
476479

477480
# Store list of packages (must be last)
478481
RUN mkdir -p /opt/nvidia/isaac_ros_dev_base && dpkg-query -W | sort > /opt/nvidia/isaac_ros_dev_base/base-end-packages.csv
482+
483+
# Install yq
484+
RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq \
485+
&& chmod +x /usr/local/bin/yq

docker/Dockerfile.ros2_humble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ RUN python3 -m pip install \
291291
COPY rosdep/ros-humble-cuda-python-placeholder /tmp/ros-humble-cuda-python-placeholder
292292
RUN --mount=type=cache,target=/var/cache/apt \
293293
cd /tmp && source ${ROS_ROOT}/setup.bash \
294-
&& dpkg-deb --build ros-humble-cuda-python-placeholder && apt-get install -y ./ros-humble-cuda-python-placeholder.deb \
294+
&& dpkg-deb --nocheck --build ros-humble-cuda-python-placeholder && apt-get install -y ./ros-humble-cuda-python-placeholder.deb \
295295
&& rm -f ./ros-humble-cuda-python-placeholder.deb
296296

297297
# Patch gtest to make it work with CXX 17

docker/rosdep/extra_rosdeps.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4124,6 +4124,14 @@ mcap_vendor_dbgsym:
41244124
ubuntu:
41254125
focal: [ros-humble-mcap-vendor-dbgsym]
41264126
jammy: [ros-humble-mcap-vendor-dbgsym]
4127+
isaac_ros_mega_controller:
4128+
ubuntu:
4129+
focal: [ros-humble-isaac-ros-mega-controller]
4130+
jammy: [ros-humble-isaac-ros-mega-controller]
4131+
isaac_ros_mega_node_monitor:
4132+
ubuntu:
4133+
focal: [ros-humble-isaac-ros-mega-node-monitor]
4134+
jammy: [ros-humble-isaac-ros-mega-node-monitor]
41274135
menge_vendor:
41284136
ubuntu:
41294137
focal: [ros-humble-menge-vendor]
@@ -7964,6 +7972,10 @@ spacenav_dbgsym:
79647972
ubuntu:
79657973
focal: [ros-humble-spacenav-dbgsym]
79667974
jammy: [ros-humble-spacenav-dbgsym]
7975+
spatio_temporal_voxel_layer:
7976+
ubuntu:
7977+
focal: [ros-humble-spatio-temporal-voxel-layer]
7978+
jammy: [ros-humble-spatio-temporal-voxel-layer]
79677979
spdlog_vendor:
79687980
ubuntu:
79697981
focal: [ros-humble-spdlog-vendor]

0 commit comments

Comments
 (0)