From f580b8591f305a20c99ab64dad15711dd1c745ab Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Thu, 6 Feb 2025 11:28:47 +0000 Subject: [PATCH] updating docker and setting up dev requirements compatible with ros2 env --- Dockerfile.dev | 22 ++-------------------- requirements.txt | 4 ++-- requirements_dev.txt | 2 +- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 2417398..9c5e4f5 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -5,7 +5,7 @@ ########################################### # Base image ########################################### -FROM nvidia/cuda:11.8.0-runtime-ubuntu22.04 AS base +FROM nvidia/cuda:12.4.1-runtime-ubuntu22.04 AS base ENV DEBIAN_FRONTEND=noninteractive @@ -124,25 +124,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND= -########################################### -# Full+Gazebo image -########################################### -FROM full AS gazebo - -ENV DEBIAN_FRONTEND=noninteractive -# Install gazebo -RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null \ - && apt-get update && apt-get install -q -y --no-install-recommends \ - ros-humble-gazebo* \ - && rm -rf /var/lib/apt/lists/* -ENV DEBIAN_FRONTEND= - -########################################### -# Full+Gazebo+Nvidia image -########################################### - -FROM gazebo AS gazebo-nvidia +FROM full AS full-nvidia ################ # Expose the nvidia driver to allow opengl diff --git a/requirements.txt b/requirements.txt index 381c746..5108524 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -numpy>=1.26.4 # numerical computing library +numpy>=1.25.2,<=1.26.4 # numerical computing library scipy>=1.11.1 # scientific computation tools -pybullet>=3.2.6 # physics engine used for simulation +pybullet>=3.2.7 # physics engine used for simulation open3d>=0.10.0 # point cloud processing tools opencv-python>=4.9.0.80 # computer vision tools matplotlib>=3.3.4 # plotting tools diff --git a/requirements_dev.txt b/requirements_dev.txt index 612c874..b66efcb 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,4 +1,4 @@ -numpy>=1.26.4 # numerical computing library +numpy>=1.25.2,<=1.26.4 # numerical computing library scipy>=1.11.1 # scientific computation tools pybullet>=3.2.7 # physics engine used for simulation open3d>=0.10.0 # point cloud processing tools