Skip to content

Commit 0ec7d4c

Browse files
invert the conditionals on != noble to = jammy
--- Last time an Ubuntu distro was added specific conditionals were put in place for when the distro != `noble`. Since noble and jammy were the two options with the addition of resolute is easier to condition on the distro being jammy rather than not `noble` || `resolute`. This has the advantage of easier cleanup once jammy is EOL.
1 parent f538ab1 commit 0ec7d4c

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

linux_docker_resources/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN echo "deb http://repo.ros2.org/ubuntu/testing/ `lsb_release -cs` main" > /et
4242
RUN echo "Bust Cache for key update 2021-06-01" && curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | apt-key add -
4343

4444
# Add the OSRF repositories to the apt sources list.
45-
RUN if test \( ${UBUNTU_DISTRO} != noble \); then echo "deb http://packages.osrfoundation.org/gazebo/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list; fi
45+
RUN if test \( ${UBUNTU_DISTRO} = jammy \); then echo "deb http://packages.osrfoundation.org/gazebo/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list; fi
4646
RUN curl --silent http://packages.osrfoundation.org/gazebo.key | apt-key add -
4747

4848
# automatic invalidation once every day.
@@ -60,8 +60,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
6060
git \
6161
libbenchmark-dev \
6262
libbullet-dev \
63-
$(if test ${UBUNTU_DISTRO} != noble; then echo libignition-cmake2-dev; fi) \
64-
$(if test ${UBUNTU_DISTRO} != noble; then echo libignition-math6-dev; fi) \
63+
$(if test ${UBUNTU_DISTRO} = jammy; then echo libignition-cmake2-dev; fi) \
64+
$(if test ${UBUNTU_DISTRO} = jammy; then echo libignition-math6-dev; fi) \
6565
liblz4-dev \
6666
liborocos-kdl-dev \
6767
libspdlog-dev \

0 commit comments

Comments
 (0)