Skip to content

Commit

Permalink
TEMP: Remove ROS' octomap after 'rosdep install'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed May 26, 2024
1 parent 82ef3fc commit 30f831e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .docker/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN \
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
# Remove the source code from this container
rm -rf src && \
#
Expand Down
2 changes: 2 additions & 0 deletions .docker/source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ RUN --mount=type=cache,target=/root/.ccache/ \
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
rm -rf /var/lib/apt/lists/* && \
# Build the workspace
colcon build \
Expand Down
2 changes: 2 additions & 0 deletions .docker/tutorial-source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
rm -rf /var/lib/apt/lists/* && \
# Build the workspace
colcon build \
Expand Down

0 comments on commit 30f831e

Please sign in to comment.