Skip to content

Commit

Permalink
cool boi fix
Browse files Browse the repository at this point in the history
  • Loading branch information
InvincibleRMC committed Feb 16, 2024
1 parent 7465893 commit b88d37a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ WORKDIR /home/${USER_NAME}/rov-24
COPY pyproject.toml .
# Copies in ROS deps
# https://docs.docker.com/engine/reference/builder/#copy---parents
COPY --parents --chown=${USER_NAME}:${USER_NAME} ./*/*/package.xml ./*/*/*/package.xml ./
COPY --parents --chown=${USER_NAME}:${USER_NAME} ./*/*/package.xml ./*/*/*/package.xml ./*/*/*/*/package.xml ./
# Copies in Install Script
COPY .vscode/install_dependencies.sh .

Expand Down Expand Up @@ -89,7 +89,11 @@ COPY --chown=${USER_NAME}:${USER_NAME} . .
ARG EXPECTED_OUTPUT="All system dependencies have been satisfied"

# Checks that all rosdeps are installed.
RUN if [[ $(rosdep check -r --from-paths src) != "${EXPECTED_OUTPUT}" ]]; then echo "ROS deps not all installed. Trying adding another layer to COPY instruction for ROS deps."; exit 1; fi
RUN if [[ $(rosdep check -r --from-paths src --ignore-src) != "${EXPECTED_OUTPUT}" ]]; \
then echo "ROS deps not all installed. Trying adding another layer to COPY instruction for ROS deps."; \
rosdep check -r --from-paths src --ignore-src; \
exit 1; \
fi

RUN . /opt/ros/iron/setup.sh \
&& colcon build --symlink-install
1 change: 1 addition & 0 deletions src/surface/flight_control/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<depend>rclpy</depend>
<depend>sensor_msgs</depend>

<exec_depend>rov_msgs</exec_depend>
<exec_depend>ros2launch</exec_depend>

<test_depend>ament_flake8</test_depend>
Expand Down
1 change: 1 addition & 0 deletions src/surface/gui/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

<exec_depend>ros2launch</exec_depend>
<exec_depend>ros2run</exec_depend>
<exec_depend>rov_msgs</exec_depend>

<depend>mavros</depend>

Expand Down

0 comments on commit b88d37a

Please sign in to comment.