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.

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

Fix perception_pcl_ros dockerfile for release pipeline #6233

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .dev/docker/perception_pcl_ros/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# flavor appears twice, once for the FOR, once for the contents since
# Dockerfile seems to reset arguments after a FOR appears
ARG flavor="melodic"
ARG flavor="noetic"
FROM ros:${flavor}-robot

ARG flavor="melodic"
ARG flavor="noetic"
ARG workspace="/root/catkin_ws"

COPY ${flavor}_rosinstall.yaml ${workspace}/src/.rosinstall
Expand All @@ -17,10 +17,12 @@ COPY ${flavor}_rosinstall.yaml ${workspace}/src/.rosinstall
RUN sed -i "s/^# deb-src/deb-src/" /etc/apt/sources.list \
&& apt update \
&& apt install -y \
git \
libboost-iostreams-dev \
libeigen3-dev \
libflann-dev \
libqhull-dev \
python-pip \
python3-pip \
ros-${flavor}-tf2-eigen \
&& pip install -U pip \
&& pip install catkin_tools \
Expand Down
12 changes: 12 additions & 0 deletions .dev/docker/perception_pcl_ros/noetic_rosinstall.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- git:
local-name: 'noetic/perception_pcl'
uri: 'https://github.com/ros-perception/perception_pcl'
version: 'melodic-devel'
- git:
local-name: 'noetic/pcl_msgs'
uri: 'https://github.com/ros-perception/pcl_msgs'
version: 'noetic-devel'
- git:
local-name: 'pcl'
uri: 'https://github.com/PointCloudLibrary/pcl'
version: 'master'