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

Ros2 reinstate no install recommends + update osrf/ros2:source to build foxy #498

Merged
merged 2 commits into from
Nov 25, 2020
Merged

Ros2 reinstate no install recommends + update osrf/ros2:source to build foxy #498

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
161373f
revert #398 now that new version of rosdep is out
mikaelarguedas Nov 25, 2020
f90b381
[ros2] update source dockerfile to build foxy
mikaelarguedas Nov 25, 2020
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 ros2/nightly/nightly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ FROM ubuntu:focal
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
apt-get update && \
apt-get install -q -y --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*

# install packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
bash-completion \
cmake \
dirmngr \
Expand All @@ -19,7 +21,6 @@ RUN apt-get update && apt-get install -q -y \
python3-pip \
wget \
&& rm -rf /var/lib/apt/lists/*

# setup ros2 keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654

Expand All @@ -28,6 +29,7 @@ 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 \
build-essential \
git \
python3-colcon-common-extensions \
python3-colcon-mixin \
Expand Down
8 changes: 5 additions & 3 deletions ros2/source/devel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ FROM $FROM_IMAGE
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
apt-get update && \
apt-get install -q -y --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*

# install packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
bash-completion \
dirmngr \
gnupg2 \
lsb-release \
python3-pip \
&& rm -rf /var/lib/apt/lists/*

# setup keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654

Expand All @@ -29,6 +30,7 @@ ENV LC_ALL C.UTF-8

# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential \
git \
python3-colcon-common-extensions \
python3-colcon-mixin \
Expand Down
3 changes: 2 additions & 1 deletion ros2/source/images.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ images:
- docker_templates
upstream_packages:
- libasio-dev
- libssl-dev
- libtinyxml2-dev
ros2_distro: eloquent
ros2_distro: foxy
ws: /opt/ros2_ws
colcon_args:
- build
Expand Down
6 changes: 3 additions & 3 deletions ros2/source/source/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ ARG FROM_IMAGE=osrf/ros2:devel
FROM $FROM_IMAGE

# install packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
libasio-dev \
libssl-dev \
libtinyxml2-dev \
wget \
&& rm -rf /var/lib/apt/lists/*

ARG ROS_DISTRO=eloquent
ARG ROS_DISTRO=foxy
ENV ROS_DISTRO=$ROS_DISTRO
ENV ROS_VERSION=2 \
ROS_PYTHON_VERSION=3
Expand Down