From 1b38cb1b2a39439e2655d46c2e98cedd4c065191 Mon Sep 17 00:00:00 2001
From: Andres Montano <andres.montano@tecnalia.com>
Date: Tue, 5 Mar 2024 16:35:08 +0100
Subject: [PATCH] update
---
dockerfiles/devenv.Dockerfile | 12 +++------
.../ws_dependencies/humble_requirements.txt | 3 +++
.../noetic_configuration_scripts.txt | 26 +++++++++++++++++++
.../ws_dependencies/noetic_requirements.txt | 4 ++-
4 files changed, 35 insertions(+), 10 deletions(-)
create mode 100644 dockerfiles/ws_dependencies/noetic_configuration_scripts.txt
diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index 61c5ba6..d957e00 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -57,14 +57,11 @@ RUN apt-get update && \
# Install pip3 and packages
RUN apt-get install -y \
- python3-pip \
- && pip3 install sqlite_utils \
- && pip3 install transforms3d
+ python3-pip
RUN if [ "$ROS_DISTRO" = "noetic" ]; \
then \
- pip3 install conan==1.59 \
- && conan config set general.revisions_enabled=1 \
+ conan config set general.revisions_enabled=1 \
&& conan profile new default --detect > /dev/null \
&& conan profile update settings.compiler=gcc default; \
fi
@@ -100,9 +97,6 @@ COPY /ws_dependencies/* ./
# Install the packages listed in ${ROS_DISTRO}_requirements.txt
RUN if [ -f "${ROS_DISTRO}_requirements.txt" ]; \
then \
- # apt-get update && \
- # grep -v '^#' ${ROS_DISTRO}_requirements.txt | xargs apt-get install -y && \
- # apt-get clean;\
apt-get update && \
awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs apt-get install -y && \
apt-get clean; \
@@ -149,7 +143,7 @@ RUN rm -rf *
RUN apt-get --reinstall install -y libnotify-bin notify-osd
# Update this date to re-run the image final update
-LABEL image.date=04-01-2024
+LABEL image.date=05-03-2024
# Update final image
RUN apt-get update \
diff --git a/dockerfiles/ws_dependencies/humble_requirements.txt b/dockerfiles/ws_dependencies/humble_requirements.txt
index e33002d..18d4456 100644
--- a/dockerfiles/ws_dependencies/humble_requirements.txt
+++ b/dockerfiles/ws_dependencies/humble_requirements.txt
@@ -49,6 +49,9 @@ ros-humble-tf-transformations
ros-humble-rosbridge-server
ros-humble-rosbridge-suite
python3-tk
+ros-humble-ur-moveit-config
+ros-humble-ur-robot-driver
# PIP PACKAGES
+sqlite_utils
transform3d
# EOF
diff --git a/dockerfiles/ws_dependencies/noetic_configuration_scripts.txt b/dockerfiles/ws_dependencies/noetic_configuration_scripts.txt
new file mode 100644
index 0000000..d62d7eb
--- /dev/null
+++ b/dockerfiles/ws_dependencies/noetic_configuration_scripts.txt
@@ -0,0 +1,26 @@
+# conan
+RUN if [ "$ROS_DISTRO" = "noetic" ]; \
+ then \
+ conan config set general.revisions_enabled=1 \
+ && conan profile new default --detect > /dev/null \
+ && conan profile update settings.compiler=gcc default; \
+ fi
+# Workaround for Azure Kinect
+RUN if [ "$ROS_DISTRO" = "noetic" ]; \
+ then \
+ echo 'libk4a1.4 libk4a1.4/accepted-eula-hash string 0f5d5c5de396e4fee4c0753a21fee0c1ed726cf0316204edda484f08cb266d76' | debconf-set-selections \
+ && echo 'libk4abt1.0 libk4abt1.0/accepted-eula-hash string 03a13b63730639eeb6626d24fd45cf25131ee8e8e0df3f1b63f552269b176e38' | debconf-set-selections \
+ && wget https://raw.githubusercontent.com/microsoft/Azure-Kinect-Sensor-SDK/develop/scripts/99-k4a.rules \
+ && mkdir -p udev/rules.d \
+ && mv 99-k4a.rules udev/rules.d/ \
+ && cp --parents udev/rules.d/99-k4a.rules /etc; \
+ fi
+# Install docker-ce
+# RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+# RUN add-apt-repository \
+# "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+# RUN apt-get update && apt-get -y install \
+# docker-ce \
+# docker-ce-cli \
+# containerd.io \
+# docker-compose-plugin
\ No newline at end of file
diff --git a/dockerfiles/ws_dependencies/noetic_requirements.txt b/dockerfiles/ws_dependencies/noetic_requirements.txt
index 6649d31..cb8def3 100644
--- a/dockerfiles/ws_dependencies/noetic_requirements.txt
+++ b/dockerfiles/ws_dependencies/noetic_requirements.txt
@@ -69,5 +69,7 @@ libgflags-dev
libsoundio1
ros-noetic-aruco-ros
# PIP PACKAGES
-# pyk4a
+sqlite_utils
+transform3d
+conan==1.59
# EOF
\ No newline at end of file
--
GitLab