From fcc11d6c62060ea0c184c1a2aa49dba5e0cc115a Mon Sep 17 00:00:00 2001
From: Andres Montano <andres.montano@tecnalia.com>
Date: Wed, 13 Nov 2024 17:52:16 +0100
Subject: [PATCH] Add connan as install option and noetic neurondones
 dependencies

---
 dockerfiles/devenv.Dockerfile                 | 12 +++-
 .../noetic_requirements.txt                   | 61 -------------------
 .../ws_dependencies/neurondones_noetic.txt    | 37 +++++++++++
 3 files changed, 48 insertions(+), 62 deletions(-)
 create mode 100644 dockerfiles/ws_dependencies/neurondones_noetic.txt

diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index ad41fe2..ba99916 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -138,7 +138,7 @@ ENV DEBIAN_FRONTEND=
 FROM devenv as workspace-extended
 
 # Avoid warnings by switching to noninteractive
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install extra packages ws_dependencies
 ARG PACKAGES=none
@@ -182,6 +182,16 @@ RUN if [ "$PEAK_DRIVER" = "install" ]; \
     && make clean && make install || echo 'make failed but move forward';\
     fi
 
+# Install conan for Kortex driver
+ARG CONAN=none
+RUN if [ "$CONAN" = "install" ]; \
+    then \
+    pip3 install conan==1.59 \
+    && conan config set general.revisions_enabled=1 \
+    && conan profile new default --detect > /dev/null \
+    && conan profile update settings.compiler=gcc default; \
+    fi
+
 RUN rm -rf *
 
 # Update this date to re-run the image final update
diff --git a/dockerfiles/distro_dependencies/noetic_requirements.txt b/dockerfiles/distro_dependencies/noetic_requirements.txt
index 4ca7a64..786f397 100644
--- a/dockerfiles/distro_dependencies/noetic_requirements.txt
+++ b/dockerfiles/distro_dependencies/noetic_requirements.txt
@@ -19,65 +19,4 @@ ros-noetic-rosmon
 ros-noetic-rqt-controller-manager
 ros-noetic-rqt-joint-trajectory-controller
 ros-noetic-code-coverage
-# Neurondones
-ros-noetic-libpcan
-ros-noetic-moveit-ros-move-group
-ros-noetic-moveit-fake-controller-manager
-ros-noetic-moveit-kinematics
-ros-noetic-moveit-planners-ompl
-ros-noetic-moveit-ros-visualization
-ros-noetic-moveit-setup-assistant
-ros-noetic-ros-control
-ros-noetic-ros-controllers
-ros-noetic-moveit-ros-planning-interface
-ros-noetic-moveit-commander
-ros-noetic-moveit-planners
-ros-noetic-moveit-simple-controller-manager
-ros-noetic-moveit-ros-control-interface
-ros-noetic-moveit-msgs
-ros-noetic-ros-control-boilerplate
-ros-noetic-joy
-ros-noetic-spacenav-node
-spacenavd
-# Smart3D
-ros-noetic-moveit-ros-benchmarks
-ros-noetic-warehouse-ros-mongo
-ros-noetic-trac-ik-kinematics-plugin
-ros-noetic-moveit-visual-tools
-ros-noetic-moveit-resources
-ros-noetic-ur-client-library
-ros-noetic-hector-gazebo-plugins
-ros-noetic-realsense2-camera
-ros-noetic-industrial-robot-simulator
-ros-noetic-realsense2-description
-ros-noetic-industrial-robot-status-interface
-ros-noetic-pass-through-controllers
-ros-noetic-scaled-joint-trajectory-controller
-ros-noetic-speed-scaling-interface
-ros-noetic-speed-scaling-state-controller
-ros-noetic-ur-msgs
-ros-noetic-cartesian-trajectory-controller
-ros-noetic-industrial-robot-status-controller
-socat
-ros-noetic-twist-controller
-lcov
-iwyu
-cppcheck
-ros-noetic-rviz-visual-tools
-libignition-math-dev
-# ros control boilerplate
-libgflags-dev
-libsoundio1
-ros-noetic-aruco-ros
-# SPOT
-ros-noetic-twist-mux
-ros-noetic-interactive-marker-twist-server
-ros-noetic-teleop-twist-joy
-ros-noetic-velodyne-pointcloud
-ros-noetic-rgbd-launch
-ros-noetic-velodyne-description
-# PIP PACKAGES
-sqlite_utils
-transform3d
-conan==1.59
 # EOF
diff --git a/dockerfiles/ws_dependencies/neurondones_noetic.txt b/dockerfiles/ws_dependencies/neurondones_noetic.txt
new file mode 100644
index 0000000..c73f978
--- /dev/null
+++ b/dockerfiles/ws_dependencies/neurondones_noetic.txt
@@ -0,0 +1,37 @@
+# APT-GET PACKAGES
+# Neurondones
+ros-noetic-libpcan
+ros-noetic-moveit-ros-move-group
+ros-noetic-moveit-fake-controller-manager
+ros-noetic-moveit-kinematics
+ros-noetic-moveit-planners-ompl
+ros-noetic-moveit-ros-visualization
+ros-noetic-moveit-setup-assistant
+ros-noetic-ros-control
+ros-noetic-ros-controllers
+ros-noetic-moveit-ros-planning-interface
+ros-noetic-moveit-commander
+ros-noetic-moveit-planners
+ros-noetic-moveit-simple-controller-manager
+ros-noetic-moveit-ros-control-interface
+ros-noetic-moveit-msgs
+ros-noetic-ros-control-boilerplate
+ros-noetic-joy
+ros-noetic-spacenav-node
+spacenavd
+# ros control boilerplate
+libgflags-dev
+libsoundio1
+ros-noetic-aruco-ros
+# SPOT
+ros-noetic-twist-mux
+ros-noetic-interactive-marker-twist-server
+ros-noetic-teleop-twist-joy
+ros-noetic-velodyne-pointcloud
+ros-noetic-rgbd-launch
+ros-noetic-velodyne-description
+# PIP PACKAGES
+sqlite_utils
+conan==1.59
+transform3d
+# EOF
\ No newline at end of file
-- 
GitLab