Skip to content

Commit 30f831e

Browse files
committed
TEMP: Remove ROS' octomap after 'rosdep install'
1 parent 82ef3fc commit 30f831e

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

.docker/ci/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ RUN \
4040
rosdep update && \
4141
DEBIAN_FRONTEND=noninteractive \
4242
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
43+
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
44+
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
4345
# Remove the source code from this container
4446
rm -rf src && \
4547
#

.docker/source/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ RUN --mount=type=cache,target=/root/.ccache/ \
2929
rosdep update && \
3030
DEBIAN_FRONTEND=noninteractive \
3131
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
32+
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
33+
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
3234
rm -rf /var/lib/apt/lists/* && \
3335
# Build the workspace
3436
colcon build \

.docker/tutorial-source/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \
3030
rosdep update && \
3131
DEBIAN_FRONTEND=noninteractive \
3232
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
33+
# HACK: Remove ROS' octomap to avoid conflicts with system's octomap
34+
apt-get remove -y ros-${ROS_DISTRO}-octomap && \
3335
rm -rf /var/lib/apt/lists/* && \
3436
# Build the workspace
3537
colcon build \

0 commit comments

Comments
 (0)