Skip to content

Commit

Permalink
revert no-install-recommends on ros2 daily images
Browse files Browse the repository at this point in the history
Currently some overlays would fail to build because of
ros-infrastructure/rosdep#752

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
  • Loading branch information
mikaelarguedas committed Apr 7, 2020
1 parent be7cdc7 commit 72c1b66
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
7 changes: 2 additions & 5 deletions ros2/nightly/nightly/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ 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 --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*
apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*

# install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
RUN apt-get update && apt-get install -q -y \
bash-completion \
cmake \
dirmngr \
Expand All @@ -29,7 +27,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 \
build-essential \
git \
python3-colcon-common-extensions \
python3-colcon-mixin \
Expand Down
7 changes: 2 additions & 5 deletions ros2/source/devel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ 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 --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*
apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*

# install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
RUN apt-get update && apt-get install -q -y \
bash-completion \
dirmngr \
gnupg2 \
Expand All @@ -31,7 +29,6 @@ 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
2 changes: 1 addition & 1 deletion ros2/source/source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG FROM_IMAGE=osrf/ros2:devel
FROM $FROM_IMAGE

# install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
RUN apt-get update && apt-get install -q -y \
libasio-dev \
libtinyxml2-dev \
wget \
Expand Down

0 comments on commit 72c1b66

Please sign in to comment.