Skip to content

Commit 4af74e5

Browse files
Merge pull request #191 from NVIDIA-ISAAC-ROS/release-3.2
Improve container security and build robustness
2 parents 422db6e + 13bb061 commit 4af74e5

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

docker/Dockerfile.base

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
6868
python3-dev \
6969
python3-distutils \
7070
python3-flake8 \
71-
python3-pip \
7271
python3-pybind11 \
7372
python3-pytest \
7473
python3-pytest-repeat \
@@ -82,6 +81,10 @@ RUN --mount=type=cache,target=/var/cache/apt \
8281
# Set Python3 as default
8382
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
8483

84+
85+
# Install pip using the get-pip.py script. apt-get install python3-pip does not install the latest pip version.
86+
RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py && rm get-pip.py
87+
8588
# Add Isaac apt repository
8689
RUN --mount=type=cache,target=/var/cache/apt \
8790
wget -qO - https://isaac.download.nvidia.com/isaac-ros/repos.key | apt-key add - && \
@@ -165,6 +168,7 @@ RUN python3 -m pip install \
165168
flake8-import-order \
166169
flake8-quotes \
167170
gpustat==0.6.0 \
171+
h11==0.16.0 \
168172
importlib_resources \
169173
networkx \
170174
"numpy>=1.24.4,<2" \
@@ -179,10 +183,9 @@ RUN python3 -m pip install \
179183
"setuptools_scm>=6.2" \
180184
tqdm \
181185
trimesh \
182-
"warp-lang==0.11.0" \
183-
packaging==24.2 \
184-
"mapbox_earcut==1.0.1" \
185-
"yourdfpy==0.0.53" \
186+
virtualenv==20.26.6 \
187+
"warp-lang>=0.9.0" \
188+
"yourdfpy>=0.0.53" \
186189
opentelemetry-api==1.28.1 \
187190
opentelemetry-sdk==1.28.1 \
188191
opentelemetry-exporter-otlp==1.28.1
@@ -423,6 +426,10 @@ RUN apt-get install -y yasm && wget https://ffmpeg.org/releases/ffmpeg-4.4.2.tar
423426
--libdir=/usr/lib/x86_64-linux-gnu --incdir=/usr/include/x86_64-linux-gnu --arch=amd64 \
424427
--disable-stripping && make -j 4 && make install
425428

429+
# Install yq
430+
RUN wget -nv https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq \
431+
&& chmod +x /usr/local/bin/yq
432+
426433
# --------------------------------------------------------------------------------------------------
427434

428435
FROM extended-${PLATFORM} AS base
@@ -481,7 +488,3 @@ COPY middleware_profile[s]/*profile.xml /usr/local/share/middleware_profiles/
481488

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

0 commit comments

Comments
 (0)