From 8f3b5add8f2c3617d35675047b377663c5265cd0 Mon Sep 17 00:00:00 2001 From: Jakub Delicat <109142865+delihus@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:14:24 +0200 Subject: [PATCH 1/5] Add jazzy build --- .github/workflows/ros-docker-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-docker-image.yaml b/.github/workflows/ros-docker-image.yaml index ffd4816..94ebe1c 100644 --- a/.github/workflows/ros-docker-image.yaml +++ b/.github/workflows/ros-docker-image.yaml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - ros_distro: ["humble", "iron"] + ros_distro: ["jazzy", "humble", "iron"] steps: From 3909c5782fd531a8a75e051765c33e08aa50677c Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Wed, 24 Jul 2024 12:23:37 +0200 Subject: [PATCH 2/5] Build luxonis from source Signed-off-by: Jakub Delicat --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ace0a9c..a21b338 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,10 @@ RUN git clone https://github.com/husarion/rosbot_ros.git && \ find open_manipulator_x -mindepth 1 -maxdepth 1 ! -name 'open_manipulator_x_description' -exec rm -r {} + && \ # ROSbot XL + manipulator setup git clone https://github.com/husarion/rosbot_xl_manipulation_ros && \ - find rosbot_xl_manipulation_ros -mindepth 1 -maxdepth 1 ! -name 'rosbot_xl_manipulation_description' -exec rm -r {} + + find rosbot_xl_manipulation_ros -mindepth 1 -maxdepth 1 ! -name 'rosbot_xl_manipulation_description' -exec rm -r {} + && + # Luxonis cameras + git clone https://github.com/luxonis/depthai-ros.git && \ + find depthai_descriptions -mindepth 1 -maxdepth 1 ! -name 'depthai_descriptions' -exec rm -r {} + && # ffmpeg image transport plugin RUN apt update && apt install -y \ @@ -57,9 +60,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ # for ffmpeg image transport ros-$ROS_DISTRO-cv-bridge \ # allows compressed and theora encoded streams to be received over image_transport - ros-$ROS_DISTRO-image-transport-plugins \ - # DepthAI - ros-$ROS_DISTRO-depthai-descriptions && \ + ros-$ROS_DISTRO-image-transport-plugins && \ apt-get upgrade -y && \ apt-get autoremove -y && \ apt-get clean && \ From 0355c48a34fd9c01c2f754050de0818e99a1af88 Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Wed, 24 Jul 2024 12:26:28 +0200 Subject: [PATCH 3/5] fix Signed-off-by: Jakub Delicat --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a21b338..8e18105 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,10 +26,10 @@ RUN git clone https://github.com/husarion/rosbot_ros.git && \ find open_manipulator_x -mindepth 1 -maxdepth 1 ! -name 'open_manipulator_x_description' -exec rm -r {} + && \ # ROSbot XL + manipulator setup git clone https://github.com/husarion/rosbot_xl_manipulation_ros && \ - find rosbot_xl_manipulation_ros -mindepth 1 -maxdepth 1 ! -name 'rosbot_xl_manipulation_description' -exec rm -r {} + && + find rosbot_xl_manipulation_ros -mindepth 1 -maxdepth 1 ! -name 'rosbot_xl_manipulation_description' -exec rm -r {} + && \ # Luxonis cameras git clone https://github.com/luxonis/depthai-ros.git && \ - find depthai_descriptions -mindepth 1 -maxdepth 1 ! -name 'depthai_descriptions' -exec rm -r {} + && + find depthai_descriptions -mindepth 1 -maxdepth 1 ! -name 'depthai_descriptions' -exec rm -r {} + # ffmpeg image transport plugin RUN apt update && apt install -y \ From 26db5fd20e0525d982576ed31dae36ca1a2cd7a3 Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Wed, 24 Jul 2024 12:29:10 +0200 Subject: [PATCH 4/5] fix Signed-off-by: Jakub Delicat --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8e18105..f936e96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,8 @@ RUN git clone https://github.com/husarion/rosbot_ros.git && \ git clone https://github.com/husarion/rosbot_xl_manipulation_ros && \ find rosbot_xl_manipulation_ros -mindepth 1 -maxdepth 1 ! -name 'rosbot_xl_manipulation_description' -exec rm -r {} + && \ # Luxonis cameras - git clone https://github.com/luxonis/depthai-ros.git && \ - find depthai_descriptions -mindepth 1 -maxdepth 1 ! -name 'depthai_descriptions' -exec rm -r {} + + git clone https://github.com/luxonis/depthai-ros.git && \ + find depthai-ros -mindepth 1 -maxdepth 1 ! -name 'depthai_descriptions' -exec rm -r {} + # ffmpeg image transport plugin RUN apt update && apt install -y \ From 6b518efde3d6207895188522a4f2db558d228e79 Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Wed, 24 Jul 2024 12:35:58 +0200 Subject: [PATCH 5/5] fix Signed-off-by: Jakub Delicat --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index f936e96..f88ac89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,13 @@ ARG ROS_DISTRO=humble ARG PREFIX= +ARG MYDISTRO=ros FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-base AS robot-models-builder SHELL ["/bin/bash", "-c"] ARG ROS_DISTRO ARG PREFIX +ARG MYDISTRO WORKDIR /ros2_ws/src