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

Use ament index to resolve rosdep install #323

Closed
wants to merge 1 commit into from
Closed

Use ament index to resolve rosdep install #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ros2/nightly/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ pull:
@docker pull osrf/ros2:nightly-rmw
@docker pull osrf/ros2:nightly-rmw-nonfree

push:
@docker push osrf/ros2:nightly
@docker push osrf/ros2:nightly-rmw
@docker push osrf/ros2:nightly-rmw-nonfree

clean:
@docker rmi -f osrf/ros2:nightly
@docker rmi -f osrf/ros2:nightly-rmw
Expand Down
13 changes: 6 additions & 7 deletions ros2/nightly/nightly-rmw-nonfree/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ FROM osrf/ros2:nightly-rmw

# install dependencies
ENV RTI_NC_LICENSE_ACCEPTED=yes
RUN . /opt/ros/$ROS_DISTRO/setup.sh \
&& apt-get update \
&& rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
" \
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
apt-get update && rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
" \
&& rm -rf /var/lib/apt/lists/*

# setup RTI Connext DDS
Expand Down
13 changes: 6 additions & 7 deletions ros2/nightly/nightly-rmw/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM osrf/ros2:nightly

# install dependencies
RUN . /opt/ros/$ROS_DISTRO/setup.sh \
&& apt-get update \
&& rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
rti-connext-dds-5.3.1" \
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
apt-get update && rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
rti-connext-dds-5.3.1" \
&& rm -rf /var/lib/apt/lists/*
19 changes: 7 additions & 12 deletions ros2/nightly/nightly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,15 @@ RUN colcon mixin add default \
colcon metadata update

# install dependencies
RUN . /opt/ros/$ROS_DISTRO/setup.sh \
&& apt-get update \
&& rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
libopensplice69 \
rti-connext-dds-5.3.1" \
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
apt-get update && rosdep install -y \
--from-paths /opt/ros/$ROS_DISTRO/share \
--ignore-src \
--skip-keys " \
libopensplice69 \
rti-connext-dds-5.3.1" \
&& rm -rf /var/lib/apt/lists/*

# FIXME Remove this once rosdep detects ROS 2 packages https://github.com/ros-infrastructure/rosdep/issues/660
# ignore installed rosdep keys
ENV ROS_PACKAGE_PATH /opt/ros/$ROS_DISTRO/share

# FIXME Remove this once ament_export_interfaces respects COLCON_CURRENT_PREFIX https://github.com/ament/ament_cmake/issues/173
#Workaround hard coded paths in nightly tarball setup scripts
ARG UPSTREAM_CI_WS=/home/jenkins-agent/workspace/packaging_linux/ws
Expand Down