From 39014f3d5514b19355515ea6aa666a7438f35084 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Wed, 17 Apr 2024 12:40:51 +0200 Subject: [PATCH 1/4] update rosdep into ci Dockerfile --- .docker/ci/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile index c6aa5ee42c..62823ce5fd 100644 --- a/.docker/ci/Dockerfile +++ b/.docker/ci/Dockerfile @@ -13,6 +13,7 @@ WORKDIR /root/ws_moveit # Copy MoveIt sources from docker context COPY . src/moveit2 +RUN rosdep update --rosdistro $ROS_DISTRO # Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#minimize-the-number-of-layers RUN \ From af2dc8d9861535a02907268778a7b4d6ad88a4f7 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Wed, 17 Apr 2024 14:19:52 +0200 Subject: [PATCH 2/4] Update Dockerfile --- .docker/release/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile index 8a1b6992c4..9edc40b356 100644 --- a/.docker/release/Dockerfile +++ b/.docker/release/Dockerfile @@ -5,6 +5,7 @@ ARG ROS_DISTRO=rolling FROM ros:${ROS_DISTRO}-ros-base LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de +RUN rosdep update --rosdistro $ROS_DISTRO # Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size RUN apt-get update -q && \ apt-get upgrade -q -y && \ From 91589f240f4d45324c684ab117e8f79154c0744f Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Wed, 17 Apr 2024 14:20:34 +0200 Subject: [PATCH 3/4] Update Dockerfile --- .docker/source/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile index 1c6a0dce38..de64fe7a09 100644 --- a/.docker/source/Dockerfile +++ b/.docker/source/Dockerfile @@ -13,7 +13,7 @@ WORKDIR $ROS_UNDERLAY/.. # Copy MoveIt sources from docker context COPY . src/moveit2 - +RUN rosdep update --rosdistro $ROS_DISTRO # Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#minimize-the-number-of-layers RUN --mount=type=cache,target=/root/.ccache/ \ From 986bc56f7f103485d3cef6d87b7cf59f9c33f494 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Wed, 17 Apr 2024 14:20:55 +0200 Subject: [PATCH 4/4] Update Dockerfile --- .docker/tutorial-source/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/tutorial-source/Dockerfile b/.docker/tutorial-source/Dockerfile index 325949b2ac..e67919aff9 100644 --- a/.docker/tutorial-source/Dockerfile +++ b/.docker/tutorial-source/Dockerfile @@ -13,7 +13,7 @@ WORKDIR $ROS_UNDERLAY/.. # Copy MoveIt sources from docker context COPY . src/moveit2 - +RUN rosdep update --rosdistro $ROS_DISTRO # Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#minimize-the-number-of-layers RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \