Skip to content

Commit

Permalink
fix handling of rosdep init || true
Browse files Browse the repository at this point in the history
  • Loading branch information
jpbusch committed Dec 13, 2024
1 parent e53691b commit f7f7a89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ RUN echo "colcon list -p --base-paths src/ --packages-select \\" >> $WORKSPACE/.
RUN echo "set -e" > $WORKSPACE/.install-dependencies.sh && \
source /opt/ros/$ROS_DISTRO/setup.bash && \
apt-get update && \
rosdep init || true && \
(rosdep init || true) && \
rosdep update --rosdistro ${ROS_DISTRO} && \
export OS="ubuntu:$(lsb_release -c | awk '{print $2}')" && \
if [[ "$ROS_DISTRO" = "rolling" && "$OS" = "ubuntu:focal" ]]; then export OS="ubuntu:jammy"; fi && \
Expand Down Expand Up @@ -233,7 +233,7 @@ RUN source /opt/ros/$ROS_DISTRO/setup.bash && \
if [[ "$(lsb_release -r | awk '{print $2}')" == "22.04" ]]; then \
git clone -b 2.2.x https://github.com/eProsima/Fast-CDR.git /opt/ws_rmw_zenoh/src/Fast-CDR ; \
fi && \
rosdep init || true && \
(rosdep init || true) && \
rosdep update --rosdistro $ROS_DISTRO && \
apt-get update && \
cd /opt/ws_rmw_zenoh && \
Expand Down

0 comments on commit f7f7a89

Please sign in to comment.