From da55eaf679abd6ac96f8fbd2e83869e90008c599 Mon Sep 17 00:00:00 2001
From: Andres Montano <andres.montano@tecnalia.com>
Date: Wed, 13 Nov 2024 15:21:31 +0100
Subject: [PATCH] Add project dependencies
---
config/vcode_configs.zip | Bin 0 -> 3091 bytes
dockerfiles/devenv.Dockerfile | 70 +++++++++---------
dockerfiles/ws_dependencies/mairon_jazzy.txt | 1 -
.../ws_dependencies/neurondones_humble.txt | 3 +
4 files changed, 38 insertions(+), 36 deletions(-)
create mode 100644 config/vcode_configs.zip
diff --git a/config/vcode_configs.zip b/config/vcode_configs.zip
new file mode 100644
index 0000000000000000000000000000000000000000..dcf0424ad88b9f5dfc4134e8a6562b7f0a97dc5f
GIT binary patch
literal 3091
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
Z>K}^7(uC#U6ac_-uqqDT&5Gme?%!WzRlWcK
literal 0
HcmV?d00001
diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index 7dece74..ad41fe2 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -65,7 +65,7 @@ RUN apt-get update && \
# Install zsh if requested
RUN if [ "$EXT_SHELL" = "zsh" ]; \
then \
- apt-get -y install zsh; \
+ apt-get -y install zsh; \
fi
# Configure system to look for debian packages in the Tecnalia's artifactory repository
@@ -83,14 +83,14 @@ COPY /distro_dependencies/* ./
# Install the packages listed in ${ROS_DISTRO}_requirements.txt
RUN if [ -f "${ROS_DISTRO}_requirements.txt" ]; \
then \
- apt-get update && \
- # Install apt-get packages
- awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs apt-get install -y && \
- # Install pip packages
- # workaround for ROS jazzy
- export PIP_BREAK_SYSTEM_PACKAGES=1 && \
- awk '/^# PIP PACKAGES/,0' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs -r -n1 pip install -U ;\
- apt-get clean; \
+ apt-get update && \
+ # Install apt-get packages
+ awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs apt-get install -y && \
+ # Install pip packages
+ # workaround for ROS jazzy
+ export PIP_BREAK_SYSTEM_PACKAGES=1 && \
+ awk '/^# PIP PACKAGES/,0' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs -r -n1 pip install -U ;\
+ apt-get clean; \
fi
# Install extra libs from .deb files
@@ -100,10 +100,10 @@ COPY /extra_libs/* ./
# Install the packages listed in common_libs.txt
RUN if [ -f "common_libs.txt" ]; \
then \
- # Download .deb files from common_libs.txt using wget
- grep -v '^#' common_libs.txt | xargs wget \
- # Install .deb files
- && dpkg -i *.deb; \
+ # Download .deb files from common_libs.txt using wget
+ grep -v '^#' common_libs.txt | xargs wget \
+ # Install .deb files
+ && dpkg -i *.deb; \
fi
# Install notify-osd
@@ -146,40 +146,40 @@ WORKDIR /tmp/dependencies/
COPY /ws_dependencies/* ./
RUN if [ "$PACKAGES" != "none" ]; \
then \
- if [ -f "${PACKAGES}" ]; \
- then \
- # Install apt-get packages
- apt-get update && \
- awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${PACKAGES} | grep -v '^#' | xargs apt-get install -y && \
- # Install pip packages
- export PIP_BREAK_SYSTEM_PACKAGES=1 && \
- awk '/^# PIP PACKAGES/,0' ${PACKAGES} | grep -v '^#' | xargs -r -n1 pip install -U ;\
- apt-get clean; \
- fi \
+ if [ -f "${PACKAGES}" ]; \
+ then \
+ # Install apt-get packages
+ apt-get update && \
+ awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${PACKAGES} | grep -v '^#' | xargs apt-get install -y && \
+ # Install pip packages
+ export PIP_BREAK_SYSTEM_PACKAGES=1 && \
+ awk '/^# PIP PACKAGES/,0' ${PACKAGES} | grep -v '^#' | xargs -r -n1 pip install -U ;\
+ apt-get clean; \
+ fi \
fi
# Install open3d from source workaround in jazzy
ARG OPEN3D=none
RUN if [ "$OPEN3D" = "install" ]; \
then \
- PIP_BREAK_SYSTEM_PACKAGES=1 pip install -U -f https://www.open3d.org/docs/latest/getting_started.html --only-binary open3d open3d; \
+ PIP_BREAK_SYSTEM_PACKAGES=1 pip install -U -f https://www.open3d.org/docs/latest/getting_started.html --only-binary open3d open3d || true; \
fi
# Install Peak driver
ARG PEAK_DRIVER=none
RUN if [ "$PEAK_DRIVER" = "install" ]; \
then \
- apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) \
- && wget https://www.peak-system.com/fileadmin/media/linux/files/peak-linux-driver-8.18.0.tar.gz \
- # && wget https://www.peak-system.com/quick/PEAK-Linux-Driver -O peak-linux-driver.tar.gz \
- && wget https://www.peak-system.com/quick/BasicLinux -O PCAN-Basic_Linux.tar.gz \
- && tar -xvf peak-linux-driver-8.18.0.tar.gz \
- && cd peak-linux-driver-8.18.0 \
- && make clean && make install || echo 'make failed but move forward'\
- && cd .. \
- && tar -xvf PCAN-Basic_Linux.tar.gz \
- && cd PCAN-Basic_Linux-4.9.0.7/libpcanbasic \
- && make clean && make install || echo 'make failed but move forward';\
+ apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) \
+ && wget https://www.peak-system.com/fileadmin/media/linux/files/peak-linux-driver-8.18.0.tar.gz \
+ # && wget https://www.peak-system.com/quick/PEAK-Linux-Driver -O peak-linux-driver.tar.gz \
+ && wget https://www.peak-system.com/quick/BasicLinux -O PCAN-Basic_Linux.tar.gz \
+ && tar -xvf peak-linux-driver-8.18.0.tar.gz \
+ && cd peak-linux-driver-8.18.0 \
+ && make clean && make install || echo 'make failed but move forward'\
+ && cd .. \
+ && tar -xvf PCAN-Basic_Linux.tar.gz \
+ && cd PCAN-Basic_Linux-4.9.0.7/libpcanbasic \
+ && make clean && make install || echo 'make failed but move forward';\
fi
RUN rm -rf *
diff --git a/dockerfiles/ws_dependencies/mairon_jazzy.txt b/dockerfiles/ws_dependencies/mairon_jazzy.txt
index fcb8e75..b09a134 100644
--- a/dockerfiles/ws_dependencies/mairon_jazzy.txt
+++ b/dockerfiles/ws_dependencies/mairon_jazzy.txt
@@ -57,7 +57,6 @@ ros-jazzy-ur-moveit-config
ros-jazzy-ur-robot-driver
xdot
# PIP PACKAGES
-open3d
pyads
sqlite-utils
torch
diff --git a/dockerfiles/ws_dependencies/neurondones_humble.txt b/dockerfiles/ws_dependencies/neurondones_humble.txt
index 1f0890b..25fbdc9 100644
--- a/dockerfiles/ws_dependencies/neurondones_humble.txt
+++ b/dockerfiles/ws_dependencies/neurondones_humble.txt
@@ -39,6 +39,9 @@ ros-humble-controller-interface
ros-humble-controller-manager
ros-humble-generate-parameter-library
ros-humble-hardware-interface
+# moveIT servo
+ros-humble-moveit-servo
+ros-humble-moveit-resources
# PIP PACKAGES
# transform3d
# EOF
\ No newline at end of file
--
GitLab