Skip to content

Commit f10fc41

Browse files
authored
Add support for the newer Rolling and Jazzy distros in our dev Dockerfile. (#455)
1 parent 83ab23a commit f10fc41

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ROS_DISTRO=humble
2-
FROM ros:$ROS_DISTRO as base
2+
FROM ros:$ROS_DISTRO AS base
33
ARG DEBIAN_FRONTEND=noninteractive
44

55
# Install dependencies
@@ -15,10 +15,10 @@ RUN apt-get update && apt-get install -y \
1515
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.75.0 -y
1616
ENV PATH=/root/.cargo/bin:$PATH
1717

18-
RUN pip install --upgrade pytest
19-
2018
# Install the colcon-cargo and colcon-ros-cargo plugins
21-
RUN pip install git+https://github.com/colcon/colcon-cargo.git git+https://github.com/colcon/colcon-ros-cargo.git
19+
RUN if [ "$ROS_DISTRO" = "humble" ] ; \
20+
then pip install --upgrade pytest && pip install colcon-ros-cargo ; \
21+
else pip install --break-system-packages pytest colcon-ros-cargo ; fi
2222

2323
RUN mkdir -p /workspace && echo "Did you forget to mount the repository into the Docker container?" > /workspace/HELLO.txt
2424
WORKDIR /workspace

0 commit comments

Comments
 (0)