Skip to content

Commit

Permalink
Perform all apt operations except those targeting the ROS repositorie…
Browse files Browse the repository at this point in the history
…s before daily invalidation.

There is no reason that these installations should be performed after
the daily cache bust. As far as I can tell their presence here is
entirely accidental.

The ROS 1 packages being installed after invalidation makes some sense
since ROS distributions change more frequently than the base Ubuntu or
Debian release.
  • Loading branch information
nuclearsandwich committed Mar 18, 2022
1 parent ce5491f commit ac4c1ac
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions linux_docker_resources/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,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 @@ -162,6 +147,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

0 comments on commit ac4c1ac

Please sign in to comment.