Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TEMP: Remove ROS' octomap after 'rosdep install' #2855

Closed
wants to merge 2 commits into from
Closed

TEMP: Remove ROS' octomap after 'rosdep install' #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f831e
TEMP: Remove ROS' octomap after 'rosdep install'
rhaschke May 26, 2024
dd24843
Drop octomap from moveit2_rolling.repos
rhaschke May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .docker/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# 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 \

Check failure on line 18 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / Lint Dockerfiles (ci) 

SC2086 info: Double quote to prevent globbing and word splitting.
# Update apt package list as previous containers clear the cache
apt-get -q update && \
apt-get -q -y upgrade --with-new-pkgs && \
Expand All @@ -40,6 +40,8 @@
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# 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/ \

Check failure on line 19 in .docker/source/Dockerfile

View workflow job for this annotation

GitHub Actions / Lint Dockerfiles (source) 

SC2086 info: Double quote to prevent globbing and word splitting.
# Enable ccache
PATH=/usr/lib/ccache:$PATH && \
# Fetch required upstream sources for building
Expand All @@ -29,6 +29,8 @@
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
View file
Open in desktop
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
4 changes: 0 additions & 4 deletions moveit2_rolling.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
repositories:
octomap:
type: git
url: https://github.com/octomap/octomap.git
version: devel
geometric_shapes:
type: git
url: https://github.com/moveit/geometric_shapes.git
Expand Down
Loading