From 1134b6b7f8a036a1b8bf07bfb61d2cd873adbbcf Mon Sep 17 00:00:00 2001
From: Jaiveer Singh <jaiveers@nvidia.com>
Date: Thu, 16 Jan 2025 17:39:49 -0800
Subject: [PATCH] Update buildtools installation

---
 README.md                              |  2 +-
 docker/Dockerfile.base                 | 13 ++++++++-----
 isaac_ros_test/build/version_info.yaml |  7 -------
 3 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 isaac_ros_test/build/version_info.yaml

diff --git a/README.md b/README.md
index 329c7a7..ab476bb 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Dockerfiles and scripts for development using the Isaac ROS suite.
 
 ## Overview
 
-The [Isaac ROS Common](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_common)
+The Isaac ROS Common
 repository contains a number of scripts and Dockerfiles to help
 streamline development and testing with the Isaac ROS suite.
 
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index a26474e..9cccc35 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -146,11 +146,16 @@ apt-get update && apt-get install -y \
 RUN python3 -m pip install -U \
 setuptools==65.7.0
 
-# Python3 (PIP)
+# Python3 PIP buildtools
+RUN python3 -m pip install -U \
+        Cython \
+        ninja \
+        wheel
+
+# Python3 PIP packages
 RUN python3 -m pip install -U \
         argcomplete \
         autopep8 \
-        Cython \
         flake8 \
         flake8-blind-except \
         flake8-builtins \
@@ -163,7 +168,6 @@ RUN python3 -m pip install -U \
         gpustat==0.6.0 \
         importlib_resources \
         networkx \
-        ninja \
         "numpy>=1.24.4,<2" \
         numpy-quaternion \
         onnx \
@@ -177,7 +181,6 @@ RUN python3 -m pip install -U \
         tqdm \
         trimesh \
         "warp-lang>=0.9.0" \
-        wheel \
         "yourdfpy>=0.0.53"
 
 # Add MQTT binaries and libraries
@@ -364,7 +367,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/tritonserver/lib"
 # Current libboost-dev apt packages are < 1.78, so install from tar.gz
 RUN --mount=type=cache,target=/var/cache/apt \
     wget -O /tmp/boost.tar.gz \
-    https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz \
+    https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz \
     && (cd /tmp && tar xzf boost.tar.gz) \
     && cd /tmp/boost_1_80_0 \
     && ./bootstrap.sh --prefix=/usr \
diff --git a/isaac_ros_test/build/version_info.yaml b/isaac_ros_test/build/version_info.yaml
deleted file mode 100644
index 09c7a65..0000000
--- a/isaac_ros_test/build/version_info.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-build_datetime: '2024-11-12T18:11:11.201185'
-git_branch: jaiveers/mock-model-generator
-git_commit_date: 2024-11-12 17:53:00 -0800
-git_commit_hash: 8aa2e9f4334d988223e9c11665cd5634f59158e9
-git_commit_message: Working with full support for dynamic axes
-git_workspace_dirty: 'Yes'
-version: 3.2.0