diff --git a/config/vcode_configs.zip b/config/vcode_configs.zip
new file mode 100644
index 0000000000000000000000000000000000000000..dcf0424ad88b9f5dfc4134e8a6562b7f0a97dc5f
Binary files /dev/null and b/config/vcode_configs.zip differ
diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index 7dece7465b730f351163ce4e3bb3441f15020706..ad41fe2ac8632a3a129a1157f2cb20dc63797972 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 fcb8e755d1569f54f111702e7e89da1360c59bec..b09a134be4db771077c9dc9615e40e74a35c527e 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 1f0890b4277643cd8a96ed1179d1257ac506ed71..25fbdc98682af31a997b2d3e8713c17da6602660 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