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

Perform all apt operations except those targeting the ROS repositories before daily invalidation. #639

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Perform all apt operations except those targeting the ROS repositories before daily invalidation. #639

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
30 changes: 15 additions & 15 deletions linux_docker_resources/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y libtinyxml-dev
# Install Python3 development files.
RUN apt-get update && apt-get install --no-install-recommends -y python3-dev

# automatic invalidation once every day.
RUN echo "@today_str"

# Install build and test dependencies of ros1_bridge if there is a valid ROS 1 distro.
RUN if test ${BRIDGE} = true -a -n "${ROS1_DISTRO}"; then apt-get update && apt-get install --no-install-recommends -y \
ros-${ROS1_DISTRO}-catkin \
ros-${ROS1_DISTRO}-common-msgs \
ros-${ROS1_DISTRO}-rosbash \
ros-${ROS1_DISTRO}-roscpp \
ros-${ROS1_DISTRO}-roslaunch \
ros-${ROS1_DISTRO}-rosmsg \
ros-${ROS1_DISTRO}-roscpp-tutorials \
ros-${ROS1_DISTRO}-rospy-tutorials \
ros-${ROS1_DISTRO}-tf2-msgs; fi

# Install dependencies for RViz visual tests
RUN apt-get update && apt-get install --no-install-recommends -y \
libgl1-mesa-dri \
Expand All @@ -165,6 +150,21 @@ RUN apt-get update && apt-get install -y \
libacl1-dev \
libncurses5-dev

# automatic invalidation once every day.
RUN echo "@today_str"

# Install build and test dependencies of ros1_bridge if there is a valid ROS 1 distro.
RUN if test ${BRIDGE} = true -a -n "${ROS1_DISTRO}"; then apt-get update && apt-get install --no-install-recommends -y \
ros-${ROS1_DISTRO}-catkin \
ros-${ROS1_DISTRO}-common-msgs \
ros-${ROS1_DISTRO}-rosbash \
ros-${ROS1_DISTRO}-roscpp \
ros-${ROS1_DISTRO}-roslaunch \
ros-${ROS1_DISTRO}-rosmsg \
ros-${ROS1_DISTRO}-roscpp-tutorials \
ros-${ROS1_DISTRO}-rospy-tutorials \
ros-${ROS1_DISTRO}-tf2-msgs; fi

# After all packages are installed, update ccache symlinks (see ros2/ci#326).
# This command is supposed to be invoked whenever a new compiler is installed
# but that isn't happening. So we invoke it here to make sure all compilers are
Expand Down