Skip to content

[ros2:devel / ros2:nightly] install colcon from pip and not apt #272

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

Merged
merged 1 commit into from
Jun 4, 2019
Merged

[ros2:devel / ros2:nightly] install colcon from pip and not apt #272

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
6 changes: 5 additions & 1 deletion ros2/nightly/nightly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ RUN echo "deb http://packages.ros.org/ros2-testing/ubuntu `lsb_release -sc` main
# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
git \
python3-colcon-common-extensions \
python3-rosdep \
python3-vcstool \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -42,6 +41,7 @@ RUN rosdep init \
# install python packages
RUN pip3 install -U \
argcomplete \
colcon-common-extensions \
flake8 \
flake8-blind-except \
flake8-builtins \
Expand All @@ -54,6 +54,10 @@ RUN pip3 install -U \
pytest-repeat \
pytest-rerunfailures

# FIXME This is a workaround for pytest not found causing builds to fail
# Following RUN statements tests for regression of https://github.com/ros2/ros2/issues/722
RUN pip3 freeze | grep pytest \
&& python3 -m pytest --version
# install ros2 packages
ENV ROS_DISTRO dashing
RUN mkdir -p /opt/ros/$ROS_DISTRO
Expand Down
7 changes: 6 additions & 1 deletion ros2/source/devel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ ENV LC_ALL C.UTF-8
# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
git \
python3-colcon-common-extensions \
python3-rosdep \
python3-vcstool \
&& rm -rf /var/lib/apt/lists/*

# install python packages
RUN pip3 install -U \
argcomplete \
colcon-common-extensions \
flake8 \
flake8-blind-except \
flake8-builtins \
Expand All @@ -50,6 +50,11 @@ RUN pip3 install -U \
pytest-repeat \
pytest-rerunfailures

# FIXME This is a workaround for pytest not found causing builds to fail
# Following RUN statements tests for regression of https://github.com/ros2/ros2/issues/722
RUN pip3 freeze | grep pytest \
&& python3 -m pytest --version

# bootstrap rosdep
RUN rosdep init \
&& rosdep update
Expand Down